diff --git a/README.md b/README.md
index 757c4d7..d5a3e6f 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,6 @@ To install, run:
 
 `ember install ember-autoserve`
 
-Then, instead of running `ember serve`, run `ember autoserve` instead.
+Then, instead of running `ember serve`, run `ember autoserve` or `ember as` instead.
 
-Your development server will be automatically restarted when `ember-cli-build.js`, `.jshintrc`, or when you install a new addon!
\ No newline at end of file
+Your development server will be automatically restarted when `ember-cli-build.js` or `.jshintrc` change, when you install a new addon, or when you [enter `rs`](https://github.com/remy/nodemon#manual-restarting)!
\ No newline at end of file
diff --git a/index.js b/index.js
index e90169d..8f4d6e2 100644
--- a/index.js
+++ b/index.js
@@ -2,7 +2,7 @@
 'use strict';
 
 var nodemon = require('nodemon');
-var Promise = require('ember-cli/lib/ext/promise');
+var { Promise } = require('rsvp');
 var path = require('path');
 var which = require('which');
 
@@ -13,6 +13,7 @@ module.exports = {
     return {
       autoserve: {
         name: 'autoserve',
+        aliases: ['as'],
         description: 'Runs `ember serve` and will automatically restart it when necessary',
         works: 'insideProject',
 
@@ -42,7 +43,9 @@ module.exports = {
               // console.log('`ember serve` has quit');
               resolve();
             }).on('restart', function (files) {
-              console.log('Detected changes to: ' + files.map(function(f) { return path.basename(f); }).join(", "))
+              if (files) {
+                console.log('Detected changes to: ' + files.map(function(f) { return path.basename(f); }).join(", "))
+              }	
               console.log('Restarting `ember serve`');
             });
           });
diff --git a/package.json b/package.json
index c5de1fa..23f7266 100644
--- a/package.json
+++ b/package.json
@@ -18,34 +18,34 @@
   "author": "Erik Bryn",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.4.2",
-    "ember-ajax": "^2.0.1",
-    "ember-cli": "2.6.0-beta.1",
-    "ember-cli-app-version": "^1.0.0",
-    "ember-cli-dependency-checker": "^1.2.0",
-    "ember-cli-htmlbars": "^1.0.3",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
-    "ember-cli-inject-live-reload": "^1.4.0",
-    "ember-cli-jshint": "^1.0.0",
-    "ember-cli-qunit": "^1.4.0",
-    "ember-cli-release": "0.2.8",
-    "ember-cli-sri": "^2.1.0",
-    "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.5.0",
-    "ember-disable-prototype-extensions": "^1.1.0",
-    "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.5.1",
-    "ember-resolver": "^2.0.3",
-    "ember-welcome-page": "^1.0.1",
-    "loader.js": "^4.0.1"
+    "broccoli-asset-rev": "^2.6.0",
+    "ember-ajax": "^3.0.0",
+    "ember-cli": "2.18.1",
+    "ember-cli-app-version": "^3.1.3",
+    "ember-cli-dependency-checker": "^2.1.0",
+    "ember-cli-htmlbars": "^2.0.3",
+    "ember-cli-htmlbars-inline-precompile": "^1.0.2",
+    "ember-cli-inject-live-reload": "^1.7.0",
+    "ember-cli-jshint": "^2.0.1",
+    "ember-cli-qunit": "^4.3.0",
+    "ember-cli-release": "1.0.0-beta.2",
+    "ember-cli-sri": "^2.1.1",
+    "ember-cli-uglify": "^2.0.0",
+    "ember-data": "^2.18.0",
+    "ember-disable-prototype-extensions": "^1.1.3",
+    "ember-export-application-global": "^2.0.0",
+    "ember-load-initializers": "^1.0.0",
+    "ember-resolver": "^4.5.0",
+    "ember-welcome-page": "^3.1.1",
+    "loader.js": "^4.6.0"
   },
   "keywords": [
     "ember-addon"
   ],
   "dependencies": {
-    "ember-cli-babel": "^5.1.6",
-    "nodemon": "^1.9.1",
-    "which": "^1.2.4"
+    "ember-cli-babel": "^6.11.0",
+    "nodemon": "^1.14.11",
+    "which": "^1.3.0"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"