diff --git a/mobile/.jshintrc b/mobile/.jshintrc
index 42624ff..9f82dad 100644
--- a/mobile/.jshintrc
+++ b/mobile/.jshintrc
@@ -7,7 +7,8 @@
     "ID3",
     "FileAPIReader",
     "SC",
-    "introJs"
+    "introJs",
+    "Ps"
   ],
   "browser": true,
   "boss": true,
diff --git a/mobile/.watchmanconfig b/mobile/.watchmanconfig
index e7834e3..004881c 100644
--- a/mobile/.watchmanconfig
+++ b/mobile/.watchmanconfig
@@ -1,3 +1 @@
-{
-  "ignore_dirs": ["tmp", "dist"]
-}
+{"ignore_dirs":["tmp","dist","ember-cordova"]}
diff --git a/mobile/app/index.html b/mobile/app/index.html
index b8b99df..dbe0ee4 100644
--- a/mobile/app/index.html
+++ b/mobile/app/index.html
@@ -9,8 +9,6 @@
     <meta name="author" content="Egor Philippov">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    <link type="text/plain" rel="author" href="http://www.huegasm.com/humans.txt" />
-
     {{content-for 'head'}}
 
     <link href='https://fonts.googleapis.com/css?family=Slabo+27px|Open+Sans' rel='stylesheet' type='text/css'>
diff --git a/mobile/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs b/mobile/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs
index f07e88e..21a2a86 100644
--- a/mobile/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs
+++ b/mobile/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs
@@ -1,7 +1,7 @@
 {{#if isShowingModal}}
   {{#modal-dialog close="close" alignment="center" translucentOverlay=true attachment="center" targetAttachment="center"}}
 
-    <p>Enter a <a href="#" onclick="window.open('https://soundcloud.com', '_system');">SoundCloud</a> track or playlist/set URL</p>
+    <p>Enter a <a href="#" onclick="window.open('https://soundcloud.com', '_blank');">SoundCloud</a> track or playlist/set URL</p>
     <p>( ex. https://soundcloud.com/mrsuicidesheep/tracks )</p>
 
     {{paper-input label="SoundCloud URL" icon="search" value=url onChange=(action (mut url))}}
diff --git a/mobile/app/pods/components/music-tab/component.js b/mobile/app/pods/components/music-tab/component.js
index f6106d2..0ca029b 100644
--- a/mobile/app/pods/components/music-tab/component.js
+++ b/mobile/app/pods/components/music-tab/component.js
@@ -214,6 +214,8 @@ export default Component.extend(helperMixin, visualizerMixin, {
       client_id: this.get('SC_CLIENT_ID')
     });
 
+    this.set('oldPlayQueueLength', this.get('playQueue.length'));
+
     document.addEventListener('pause', () => {
       if(this.get('playing')){
         this.send('play');
@@ -226,6 +228,11 @@ export default Component.extend(helperMixin, visualizerMixin, {
 
     let self = this;
 
+    // perfect-scrollbar
+    Ps.initialize(document.getElementById('play-list-area'), {
+      swipePropagation: false
+    });
+
     // file input code
     $('#file-input').on('change', function() {
       let files = this.files;
diff --git a/mobile/app/pods/components/music-tab/mixins/helpers.js b/mobile/app/pods/components/music-tab/mixins/helpers.js
index 2120360..d6edf69 100644
--- a/mobile/app/pods/components/music-tab/mixins/helpers.js
+++ b/mobile/app/pods/components/music-tab/mixins/helpers.js
@@ -4,8 +4,10 @@ const {
   Mixin,
   observer,
   computed,
+  run,
   isNone,
   inject,
+  $,
   A
 } = Ember;
 
@@ -167,8 +169,12 @@ export default Mixin.create({
 
     if(playQueuePointer !== -1 && currentVisName === 'None'){
       let song = playQueue[playQueuePointer];
-      if(song.scUrl && !isNone(song.picture)){
-        pic = song.picture.replace('67x67', '500x500');
+      if(!isNone(song.picture)){
+        pic = song.picture;
+
+        if(song.scUrl){
+          pic = pic.replace('67x67', '500x500');
+        }
       }
     }
 
@@ -247,13 +253,43 @@ export default Mixin.create({
     return this.formatTime(this.get('timeTotal'));
   }),
 
+  onPlayQueueChange: observer('playQueue.length', function(){
+    let playQueueLength = this.get('playQueue.length');
+
+    if(playQueueLength > this.get('oldPlayQueueLength')){
+      run.once(this, ()=>{
+        run.next(this, function() {
+          $(`.track${playQueueLength-1}`).velocity('scroll', { container: $('#play-list-area'), duration: 200 });
+          Ps.update(document.getElementById('play-list-area'));
+        });
+      });
+    } else {
+      run.once(this, ()=>{
+        run.next(this, function() {
+          Ps.update(document.getElementById('play-list-area'));
+        });
+      });
+    }
+
+    this.set('oldPlayQueueLength', playQueueLength);
+  }),
+
   onColorloopModeChange: observer('colorloopMode', 'playing', function(){
     this.set('colorLoopOn', this.get('playing') && this.get('colorloopMode'));
   }),
 
-  onOptionChange: observer('flashingTransitions', 'playQueue.[]', 'playQueuePointer', 'colorloopMode', function(self, option){
+  onOptionChange: observer('flashingTransitions', 'playQueue.[]', 'playQueuePointer', 'colorloopMode', 'ambienceMode', function(self, option){
     option = option.replace('.[]', '');
-    this.get('storage').set('huegasm.' + option, this.get(option));
+    let value = this.get(option);
+
+    // can't really save local music
+    if(option === 'playQueue'){
+      value = value.filter((song)=>{
+        return !song.url.startsWith('blob:');
+      });
+    }
+
+    this.get('storage').set('huegasm.' + option, value);
   }),
 
   formatTime(time){
diff --git a/mobile/app/styles/app.scss b/mobile/app/styles/app.scss
index fd8f669..733f5f3 100644
--- a/mobile/app/styles/app.scss
+++ b/mobile/app/styles/app.scss
@@ -58,3 +58,7 @@ div.ember-modal-dialog {
     width: 200px;
   }
 }
+
+.ps-scrollbar-y-rail {
+  opacity: 1 !important;
+}
diff --git a/mobile/app/styles/music-tab.scss b/mobile/app/styles/music-tab.scss
index a78010a..c050c23 100644
--- a/mobile/app/styles/music-tab.scss
+++ b/mobile/app/styles/music-tab.scss
@@ -152,7 +152,7 @@
   border-radius: 5px;
   transition: 0.1s all ease-in-out;
   position: relative;
-  overflow: auto;
+  overflow: hidden;
   #dragHere {
     position: absolute;
     top: 27%;
diff --git a/mobile/bower.json b/mobile/bower.json
index d7a88d5..27f1b17 100644
--- a/mobile/bower.json
+++ b/mobile/bower.json
@@ -11,6 +11,7 @@
     "locallyjs": "^0.3.2",
     "matchMedia": "^0.3.0",
     "nouislider": "^9.0.0",
-    "velocity": "^1.3.1"
+    "velocity": "^1.3.1",
+    "perfect-scrollbar": "^0.6.15"
   }
 }
diff --git a/mobile/ember-cli-build.js b/mobile/ember-cli-build.js
index d105b6c..63c38f6 100644
--- a/mobile/ember-cli-build.js
+++ b/mobile/ember-cli-build.js
@@ -12,6 +12,8 @@ module.exports = function(defaults) {
   app.import('bower_components/JavaScript-ID3-Reader/dist/id3-minimized.js');
   app.import('bower_components/locallyjs/dist/locally.min.js');
   app.import('bower_components/velocity/velocity.js');
+  app.import('bower_components/perfect-scrollbar/js/perfect-scrollbar.js');
+  app.import('bower_components/perfect-scrollbar/css/perfect-scrollbar.css');
 
   return app.toTree();
 };
diff --git a/mobile/ember-cordova/cordova/config.xml b/mobile/ember-cordova/cordova/config.xml
index b330b72..8c475ef 100644
--- a/mobile/ember-cordova/cordova/config.xml
+++ b/mobile/ember-cordova/cordova/config.xml
@@ -1,42 +1,39 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget id="com.nidratech.huegasm" version="1.2.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-  <name>Huegasm</name>
-  <description>
-    Huegasm is a free web application for managing and synchronizing your Philips Hue lights with the beat of your music.
-  </description>
-  <author email="philippovegor@gmail.com" href="http://www.egorphilippov.me/">
-    Egor Philippov
-  </author>
-  <content src="index.html"/>
-  <plugin name="ionic-plugin-keyboard" spec="~2.2.1"/>
-  <plugin name="cordova-plugin-splashscreen" spec="~4.0.1"/>
-  <access origin="*"/>
-  <allow-intent href="http://*/*"/>
-  <allow-intent href="https://*/*"/>
-  <allow-intent href="tel:*"/>
-  <allow-intent href="sms:*"/>
-  <allow-intent href="mailto:*"/>
-  <allow-intent href="geo:*"/>
-  <platform name="android">
-    <splash density="port-ldpi" src="res/drawable-port-ldpi/screen.png"/>
-    <splash density="land-ldpi" src="res/drawable-land-ldpi/screen.png"/>
-    <splash density="port-mdpi" src="res/drawable-port-mdpi/screen.png"/>
-    <splash density="land-mdpi" src="res/drawable-land-mdpi/screen.png"/>
-    <splash density="port-hdpi" src="res/drawable-port-hdpi/screen.png"/>
-    <splash density="land-hdpi" src="res/drawable-land-hdpi/screen.png"/>
-    <splash density="port-xhdpi" src="res/drawable-port-xhdpi/screen.png"/>
-    <splash density="land-xhdpi" src="res/drawable-land-xhdpi/screen.png"/>
-    <splash density="port-xxhdpi" src="res/drawable-port-xxhdpi/screen.png"/>
-    <splash density="land-xxhdpi" src="res/drawable-land-xxhdpi/screen.png"/>
-    <splash density="port-xxxhdpi" src="res/drawable-port-xxxhdpi/screen.png"/>
-    <splash density="land-xxxhdpi" src="res/drawable-land-xxxhdpi/screen.png"/>
-    <icon src="res/mipmap-ldpi/icon.png" density="ldpi"/>
-    <icon src="res/mipmap-mdpi/icon.png" density="mdpi"/>
-    <icon src="res/mipmap-hdpi/icon.png" density="hdpi"/>
-    <icon src="res/mipmap-xhdpi/icon.png" density="xhdpi"/>
-    <icon src="res/mipmap-xxhdpi/icon.png" density="xxhdpi"/>
-    <icon src="res/mipmap-xxxhdpi/icon.png" density="xxxhdpi"/>
-  </platform>
-  <engine name="android" spec="~6.0.0"/>
-  <preference name="ShowSplashScreenSpinner" value="false"/>
+<?xml version='1.0' encoding='utf-8'?>
+<widget id="com.hoboman313.huegasm" version="1.1.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+    <name>Huegasm</name>
+    <content src="index.html" />
+    <plugin name="cordova-plugin-inappbrowser" spec="~1.6.1" />
+    <plugin name="cordova-plugin-splashscreen" spec="~4.0.1" />
+    <plugin name="cordova-plugin-whitelist" spec="~1.3.1" />
+    <access origin="*" />
+    <allow-intent href="http://*/*" />
+    <allow-intent href="https://*/*" />
+    <allow-intent href="tel:*" />
+    <allow-intent href="sms:*" />
+    <allow-intent href="mailto:*" />
+    <allow-intent href="geo:*" />
+    <allow-navigation href="http://*/*" />
+    <allow-navigation href="https://*/*" />
+    <preference name="ShowSplashScreenSpinner" value="false" />
+    <platform name="android">
+        <allow-intent href="market:*" />
+        <splash density="port-ldpi" src="res/screen/android/port-ldpi.png" />
+        <splash density="land-ldpi" src="res/screen/android/land-ldpi.png" />
+        <splash density="port-mdpi" src="res/screen/android/port-mdpi.png" />
+        <splash density="land-mdpi" src="res/screen/android/land-mdpi.png" />
+        <splash density="port-hdpi" src="res/screen/android/port-hdpi.png" />
+        <splash density="land-hdpi" src="res/screen/android/land-hdpi.png" />
+        <splash density="port-xhdpi" src="res/screen/android/port-xhdpi.png" />
+        <splash density="land-xhdpi" src="res/screen/android/land-xhdpi.png" />
+        <splash density="port-xxhdpi" src="res/screen/android/port-xxhdpi.png" />
+        <splash density="land-xxhdpi" src="res/screen/android/land-xxhdpi.png" />
+        <splash density="port-xxxhdpi" src="res/screen/android/port-xxxhdpi.png" />
+        <splash density="land-xxxhdpi" src="res/screen/android/land-xxxhdpi.png" />
+        <icon density="ldpi" src="res/icon/android/ldpi.png" />
+        <icon density="mdpi" src="res/icon/android/mdpi.png" />
+        <icon density="hdpi" src="res/icon/android/hdpi.png" />
+        <icon density="xhdpi" src="res/icon/android/xhdpi.png" />
+        <icon density="xxhdpi" src="res/icon/android/xxhdpi.png" />
+        <icon density="xxxhdpi" src="res/icon/android/xxxhdpi.png" />
+    </platform>
 </widget>
diff --git a/mobile/ember-cordova/cordova/res/drawable-land-hdpi/screen.png b/mobile/ember-cordova/cordova/platforms/.gitkeep
similarity index 100%
rename from mobile/ember-cordova/cordova/res/drawable-land-hdpi/screen.png
rename to mobile/ember-cordova/cordova/platforms/.gitkeep
diff --git a/mobile/ember-cordova/cordova/res/drawable-land-ldpi/screen.png b/mobile/ember-cordova/cordova/res/drawable-land-ldpi/screen.png
deleted file mode 100644
index e69de29..0000000
diff --git a/mobile/ember-cordova/cordova/res/drawable-land-mdpi/screen.png b/mobile/ember-cordova/cordova/res/drawable-land-mdpi/screen.png
deleted file mode 100644
index e69de29..0000000
diff --git a/mobile/ember-cordova/cordova/res/drawable-land-xhdpi/screen.png b/mobile/ember-cordova/cordova/res/drawable-land-xhdpi/screen.png
deleted file mode 100644
index e69de29..0000000
diff --git a/mobile/ember-cordova/cordova/res/drawable-land-xxhdpi/screen.png b/mobile/ember-cordova/cordova/res/drawable-land-xxhdpi/screen.png
deleted file mode 100644
index e69de29..0000000
diff --git a/mobile/ember-cordova/cordova/res/drawable-land-xxxhdpi/screen.png b/mobile/ember-cordova/cordova/res/drawable-land-xxxhdpi/screen.png
deleted file mode 100644
index e69de29..0000000
diff --git a/mobile/ember-cordova/cordova/res/drawable-port-hdpi/screen.png b/mobile/ember-cordova/cordova/res/drawable-port-hdpi/screen.png
deleted file mode 100644
index e69de29..0000000
diff --git a/mobile/ember-cordova/cordova/res/drawable-port-ldpi/screen.png b/mobile/ember-cordova/cordova/res/drawable-port-ldpi/screen.png
deleted file mode 100644
index e69de29..0000000
diff --git a/mobile/ember-cordova/cordova/res/drawable-port-mdpi/screen.png b/mobile/ember-cordova/cordova/res/drawable-port-mdpi/screen.png
deleted file mode 100644
index e69de29..0000000
diff --git a/mobile/ember-cordova/cordova/res/drawable-port-xhdpi/screen.png b/mobile/ember-cordova/cordova/res/drawable-port-xhdpi/screen.png
deleted file mode 100644
index e69de29..0000000
diff --git a/mobile/ember-cordova/cordova/res/drawable-port-xxhdpi/screen.png b/mobile/ember-cordova/cordova/res/drawable-port-xxhdpi/screen.png
deleted file mode 100644
index e69de29..0000000
diff --git a/mobile/ember-cordova/cordova/res/drawable-port-xxxhdpi/screen.png b/mobile/ember-cordova/cordova/res/drawable-port-xxxhdpi/screen.png
deleted file mode 100644
index e69de29..0000000
diff --git a/mobile/ember-cordova/cordova/res/icon/android/hdpi.png b/mobile/ember-cordova/cordova/res/icon/android/hdpi.png
new file mode 100644
index 0000000..79e42ee
Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/android/hdpi.png differ
diff --git a/mobile/ember-cordova/cordova/res/icon/android/ldpi.png b/mobile/ember-cordova/cordova/res/icon/android/ldpi.png
new file mode 100644
index 0000000..b980bfa
Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/android/ldpi.png differ
diff --git a/mobile/ember-cordova/cordova/res/icon/android/mdpi.png b/mobile/ember-cordova/cordova/res/icon/android/mdpi.png
new file mode 100644
index 0000000..d62e7b7
Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/android/mdpi.png differ
diff --git a/mobile/ember-cordova/cordova/res/icon/android/xhdpi.png b/mobile/ember-cordova/cordova/res/icon/android/xhdpi.png
new file mode 100644
index 0000000..4b1efb2
Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/android/xhdpi.png differ
diff --git a/mobile/ember-cordova/cordova/res/icon/android/xxhdpi.png b/mobile/ember-cordova/cordova/res/icon/android/xxhdpi.png
new file mode 100644
index 0000000..279b93b
Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/android/xxhdpi.png differ
diff --git a/mobile/ember-cordova/cordova/res/icon/android/xxxhdpi.png b/mobile/ember-cordova/cordova/res/icon/android/xxxhdpi.png
new file mode 100644
index 0000000..ee628e2
Binary files /dev/null and b/mobile/ember-cordova/cordova/res/icon/android/xxxhdpi.png differ
diff --git a/mobile/ember-cordova/cordova/res/mipmap-hdpi/icon.png b/mobile/ember-cordova/cordova/res/mipmap-hdpi/icon.png
deleted file mode 100644
index e69de29..0000000
diff --git a/mobile/ember-cordova/cordova/res/mipmap-ldpi/icon.png b/mobile/ember-cordova/cordova/res/mipmap-ldpi/icon.png
deleted file mode 100644
index e69de29..0000000
diff --git a/mobile/ember-cordova/cordova/res/mipmap-mdpi/icon.png b/mobile/ember-cordova/cordova/res/mipmap-mdpi/icon.png
deleted file mode 100644
index e69de29..0000000
diff --git a/mobile/ember-cordova/cordova/res/mipmap-xhdpi/icon.png b/mobile/ember-cordova/cordova/res/mipmap-xhdpi/icon.png
deleted file mode 100644
index e69de29..0000000
diff --git a/mobile/ember-cordova/cordova/res/mipmap-xxhdpi/icon.png b/mobile/ember-cordova/cordova/res/mipmap-xxhdpi/icon.png
deleted file mode 100644
index e69de29..0000000
diff --git a/mobile/ember-cordova/cordova/res/mipmap-xxxhdpi/icon.png b/mobile/ember-cordova/cordova/res/mipmap-xxxhdpi/icon.png
deleted file mode 100644
index e69de29..0000000
diff --git a/mobile/ember-cordova/cordova/res/screen/android/land-hdpi.png b/mobile/ember-cordova/cordova/res/screen/android/land-hdpi.png
new file mode 100644
index 0000000..b56e6d3
Binary files /dev/null and b/mobile/ember-cordova/cordova/res/screen/android/land-hdpi.png differ
diff --git a/mobile/ember-cordova/cordova/res/screen/android/land-ldpi.png b/mobile/ember-cordova/cordova/res/screen/android/land-ldpi.png
new file mode 100644
index 0000000..bb03611
Binary files /dev/null and b/mobile/ember-cordova/cordova/res/screen/android/land-ldpi.png differ
diff --git a/mobile/ember-cordova/cordova/res/screen/android/land-mdpi.png b/mobile/ember-cordova/cordova/res/screen/android/land-mdpi.png
new file mode 100644
index 0000000..58bb386
Binary files /dev/null and b/mobile/ember-cordova/cordova/res/screen/android/land-mdpi.png differ
diff --git a/mobile/ember-cordova/cordova/res/screen/android/land-xhdpi.png b/mobile/ember-cordova/cordova/res/screen/android/land-xhdpi.png
new file mode 100644
index 0000000..58a1720
Binary files /dev/null and b/mobile/ember-cordova/cordova/res/screen/android/land-xhdpi.png differ
diff --git a/mobile/ember-cordova/cordova/res/screen/android/land-xxhdpi.png b/mobile/ember-cordova/cordova/res/screen/android/land-xxhdpi.png
new file mode 100644
index 0000000..cd8c961
Binary files /dev/null and b/mobile/ember-cordova/cordova/res/screen/android/land-xxhdpi.png differ
diff --git a/mobile/ember-cordova/cordova/res/screen/android/land-xxxhdpi.png b/mobile/ember-cordova/cordova/res/screen/android/land-xxxhdpi.png
new file mode 100644
index 0000000..222c301
Binary files /dev/null and b/mobile/ember-cordova/cordova/res/screen/android/land-xxxhdpi.png differ
diff --git a/mobile/ember-cordova/cordova/res/screen/android/port-hdpi.png b/mobile/ember-cordova/cordova/res/screen/android/port-hdpi.png
new file mode 100644
index 0000000..ea8de11
Binary files /dev/null and b/mobile/ember-cordova/cordova/res/screen/android/port-hdpi.png differ
diff --git a/mobile/ember-cordova/cordova/res/screen/android/port-ldpi.png b/mobile/ember-cordova/cordova/res/screen/android/port-ldpi.png
new file mode 100644
index 0000000..3bb8f22
Binary files /dev/null and b/mobile/ember-cordova/cordova/res/screen/android/port-ldpi.png differ
diff --git a/mobile/ember-cordova/cordova/res/screen/android/port-mdpi.png b/mobile/ember-cordova/cordova/res/screen/android/port-mdpi.png
new file mode 100644
index 0000000..b6da1e4
Binary files /dev/null and b/mobile/ember-cordova/cordova/res/screen/android/port-mdpi.png differ
diff --git a/mobile/ember-cordova/cordova/res/screen/android/port-xhdpi.png b/mobile/ember-cordova/cordova/res/screen/android/port-xhdpi.png
new file mode 100644
index 0000000..2a97841
Binary files /dev/null and b/mobile/ember-cordova/cordova/res/screen/android/port-xhdpi.png differ
diff --git a/mobile/ember-cordova/cordova/res/screen/android/port-xxhdpi.png b/mobile/ember-cordova/cordova/res/screen/android/port-xxhdpi.png
new file mode 100644
index 0000000..e939934
Binary files /dev/null and b/mobile/ember-cordova/cordova/res/screen/android/port-xxhdpi.png differ
diff --git a/mobile/ember-cordova/cordova/res/screen/android/port-xxxhdpi.png b/mobile/ember-cordova/cordova/res/screen/android/port-xxxhdpi.png
new file mode 100644
index 0000000..3f3b0cf
Binary files /dev/null and b/mobile/ember-cordova/cordova/res/screen/android/port-xxxhdpi.png differ
diff --git a/mobile/package.json b/mobile/package.json
index e131af1..dbb600e 100644
--- a/mobile/package.json
+++ b/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "huegasm_mobile",
-  "version": "1.1.0",
+  "version": "1.0.0",
   "description": "Huegasm is a free web application for managing and synchronizing your Philips Hue lights with the beat of your music.",
   "private": true,
   "directories": {
@@ -36,9 +36,7 @@
     "ember-cli-sri": "^2.1.0",
     "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-cordova": "^0.3.5",
-    "ember-cordova-events": "^0.1.0",
-    "ember-cordova-keyboard": "^0.0.2",
+    "ember-cordova": "^0.3.13",
     "ember-export-application-global": "^1.0.4",
     "ember-load-initializers": "^0.6.3",
     "ember-modal-dialog": "^0.9.0",
diff --git a/mobile/yarn.lock b/mobile/yarn.lock
index cac829a..f86177d 100644
--- a/mobile/yarn.lock
+++ b/mobile/yarn.lock
@@ -212,8 +212,8 @@ asap@^2.0.0, asap@~2.0.4:
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.5.tgz#522765b50c3510490e52d7dcfe085ef9ba96958f"
 
 asn1.js@^4.0.0:
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.0.tgz#f71a1243f3e79d46d7b07d7fbf4824ee73af054a"
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40"
   dependencies:
     bn.js "^4.0.0"
     inherits "^2.0.1"
@@ -857,8 +857,8 @@ broccoli-middleware@^0.18.1:
     mime "^1.2.11"
 
 broccoli-persistent-filter@^1.0.1, broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.2.0:
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.2.11.tgz#95cc6b0b0eb0dcce5f8e6ae18f6a3cc45a06bf40"
+  version "1.2.12"
+  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.2.12.tgz#e5fbba9d063969f74908d5ea2d0ea9940962e463"
   dependencies:
     async-disk-cache "^1.0.0"
     blank-object "^1.0.1"
@@ -901,14 +901,14 @@ broccoli-sane-watcher@^1.1.1:
     rsvp "^3.0.18"
     sane "^1.1.1"
 
-broccoli-sass-source-maps@^1.8.0:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-1.8.1.tgz#115e32be25dc5f1686af1c8d1fa4c4c62749f0b6"
+broccoli-sass-source-maps@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-2.0.0.tgz#7f25f9f4b296918cec6e00672c63e75abce33d45"
   dependencies:
     broccoli-caching-writer "^3.0.3"
     include-path-searcher "^0.1.0"
     mkdirp "^0.3.5"
-    node-sass "^3.8.0"
+    node-sass "^4.1.0"
     object-assign "^2.0.0"
     rsvp "^3.0.6"
 
@@ -1494,7 +1494,7 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concat-stream@1.5.0:
+concat-stream@1.5.0, concat-stream@^1.4.7:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.0.tgz#53f7d43c51c5e43f81c8fdd03321c631be68d611"
   dependencies:
@@ -1502,7 +1502,7 @@ concat-stream@1.5.0:
     readable-stream "~2.0.0"
     typedarray "~0.0.5"
 
-concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.2, concat-stream@~1.5.0, concat-stream@~1.5.1:
+concat-stream@^1.4.6, concat-stream@^1.5.2, concat-stream@~1.5.0, concat-stream@~1.5.1:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266"
   dependencies:
@@ -1816,8 +1816,8 @@ debug@2.3.3:
     ms "0.7.2"
 
 debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.5.1.tgz#9107bb4a506052ec2a02314bc606313ed2b921c1"
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
   dependencies:
     ms "0.7.2"
 
@@ -1930,10 +1930,6 @@ dezalgo@^1.0.0, dezalgo@^1.0.1, dezalgo@^1.0.2, dezalgo@~1.0.3:
     asap "^2.0.0"
     wrappy "1"
 
-did_it_work@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/did_it_work/-/did_it_work-0.0.6.tgz#5180cb9e16ebf9a8753a0cc6b4af9ccdff71ec05"
-
 diff@^1.3.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
@@ -2033,13 +2029,13 @@ ember-ajax@^2.0.1:
   dependencies:
     ember-cli-babel "^5.1.5"
 
-ember-basic-dropdown@^0.16.0:
-  version "0.16.4"
-  resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-0.16.4.tgz#6bf84654e4bbcf375c2a35cd341432d901c02ab5"
+ember-basic-dropdown@^0.19.1, ember-basic-dropdown@^0.19.2:
+  version "0.19.2"
+  resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-0.19.2.tgz#c1fbf90c3702f44b564b2d85d05ad2ee3c6a4e90"
   dependencies:
     ember-cli-babel "^5.1.10"
-    ember-cli-htmlbars "^1.1.0"
-    ember-wormhole "0.4.1"
+    ember-cli-htmlbars "^1.1.1"
+    ember-wormhole "^0.5.1"
 
 ember-cli-app-version@^2.0.0:
   version "2.0.1"
@@ -2121,7 +2117,7 @@ ember-cli-htmlbars-inline-precompile@^0.3.1:
     ember-cli-htmlbars "^1.0.0"
     hash-for-dep "^1.0.2"
 
-ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.1, ember-cli-htmlbars@^1.0.10, ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.0.8, ember-cli-htmlbars@^1.1.0:
+ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.1, ember-cli-htmlbars@^1.0.10, ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.0.8, ember-cli-htmlbars@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-1.1.1.tgz#8776cf59796dac8f32e8625fc6d1ea45ffa55de1"
   dependencies:
@@ -2236,13 +2232,13 @@ ember-cli-release@0.2.8:
     semver "^4.3.1"
     silent-error "^1.0.0"
 
-ember-cli-sass@^5.2.1:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-5.6.0.tgz#792de67544bb903eef421a3e59c484840fea5352"
+ember-cli-sass@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-6.0.0.tgz#31c9c8fa789c0d25aaf8e315431b7a3ec4ba0175"
   dependencies:
     broccoli-funnel "^1.0.0"
     broccoli-merge-trees "^1.1.0"
-    broccoli-sass-source-maps "^1.8.0"
+    broccoli-sass-source-maps "^2.0.0"
     ember-cli-babel "5.1.10"
     ember-cli-version-checker "^1.0.2"
     merge "^1.2.0"
@@ -2451,15 +2447,15 @@ ember-cli@^2.8.0:
     walk-sync "^0.3.0"
     yam "0.0.22"
 
-ember-composability-tools@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/ember-composability-tools/-/ember-composability-tools-0.0.5.tgz#d41026fef58f7cb18cc3b4722596ce09d7ec629f"
+ember-composability-tools@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/ember-composability-tools/-/ember-composability-tools-0.0.6.tgz#38f1b6fc4ea7edde4147f7124913ff6b078d2961"
   dependencies:
     ember-cli-babel "^5.1.6"
     ember-cli-htmlbars "^1.0.3"
-    ember-wormhole "0.4.1"
+    ember-wormhole "0.5.1"
 
-ember-concurrency@^0.7.9:
+ember-concurrency@^0.7.15:
   version "0.7.17"
   resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.7.17.tgz#28f963c96fa5d1c42bb4b239c0212220d849738f"
   dependencies:
@@ -2467,23 +2463,7 @@ ember-concurrency@^0.7.9:
     ember-getowner-polyfill "^1.1.0"
     ember-maybe-import-regenerator "^0.1.4"
 
-ember-cordova-events@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ember-cordova-events/-/ember-cordova-events-0.1.0.tgz#7217b830478f6e87bf809530d84a6046b03f662c"
-  dependencies:
-    ember-cli-babel "^5.1.6"
-
-ember-cordova-keyboard@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/ember-cordova-keyboard/-/ember-cordova-keyboard-0.0.2.tgz#b2128e3f40a285c7ba54d32d46427c202a6f3bbf"
-  dependencies:
-    chalk "^1.1.1"
-    ember-cli-babel "^5.1.5"
-    ember-cli-version-checker "^1.1.6"
-    lodash "^4.6.1"
-    rsvp "^3.2.1"
-
-ember-cordova@^0.3.5:
+ember-cordova@^0.3.13:
   version "0.3.13"
   resolved "https://registry.yarnpkg.com/ember-cordova/-/ember-cordova-0.3.13.tgz#80ab979e6e03cd7c6cd067a9408e3d4180b0557d"
   dependencies:
@@ -2505,9 +2485,9 @@ ember-cordova@^0.3.5:
     uuid "^3.0.0"
     xml2js "^0.4.17"
 
-ember-css-transitions@0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/ember-css-transitions/-/ember-css-transitions-0.1.8.tgz#2c9454b4cc1db367849a4f8a7e8c4b082bb97d19"
+ember-css-transitions@0.1.9:
+  version "0.1.9"
+  resolved "https://registry.yarnpkg.com/ember-css-transitions/-/ember-css-transitions-0.1.9.tgz#280caa7aaf2132abbeb3c960fc64ba11cf303d81"
   dependencies:
     ember-cli-babel "^5.1.6"
 
@@ -2557,32 +2537,32 @@ ember-notify@^5.0.4:
     ember-string-ishtmlsafe-polyfill "1.0.1"
     object-assign "^4.1.0"
 
-ember-paper@^1.0.0-alpha.11:
-  version "1.0.0-alpha.12"
-  resolved "https://registry.yarnpkg.com/ember-paper/-/ember-paper-1.0.0-alpha.12.tgz#9d686e5a05afd89f3143c0e72153d9c7f02b5b2a"
+ember-paper@^1.0.0-alpha.12:
+  version "1.0.0-alpha.13"
+  resolved "https://registry.yarnpkg.com/ember-paper/-/ember-paper-1.0.0-alpha.13.tgz#44d20f5b63f3405c803501ca4e35cc509d65e15d"
   dependencies:
     angular-material-source angular/material#v1.0.6
     broccoli-autoprefixer "^3.0.0"
     broccoli-filter "^1.2.3"
     broccoli-funnel "^1.0.1"
     broccoli-merge-trees "^1.1.0"
-    ember-basic-dropdown "^0.16.0"
+    ember-basic-dropdown "^0.19.2"
     ember-cli-babel "^5.1.7"
-    ember-composability-tools "0.0.5"
-    ember-css-transitions "0.1.8"
-    ember-power-select "1.0.0-beta.23"
-    ember-wormhole "0.4.1"
+    ember-composability-tools "0.0.6"
+    ember-css-transitions "0.1.9"
+    ember-power-select "1.0.3"
+    ember-wormhole "0.5.1"
     resolve "^1.1.7"
     virtual-each "0.3.1"
 
-ember-power-select@1.0.0-beta.23:
-  version "1.0.0-beta.23"
-  resolved "https://registry.yarnpkg.com/ember-power-select/-/ember-power-select-1.0.0-beta.23.tgz#a4fa05e352860c469c0dc1a44226064474232e6c"
+ember-power-select@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/ember-power-select/-/ember-power-select-1.0.3.tgz#2c907e964c1016f485095b4a32a72c9d30b26f35"
   dependencies:
-    ember-basic-dropdown "^0.16.0"
+    ember-basic-dropdown "^0.19.1"
     ember-cli-babel "^5.1.10"
-    ember-cli-htmlbars "^1.1.0"
-    ember-concurrency "^0.7.9"
+    ember-cli-htmlbars "^1.1.1"
+    ember-concurrency "^0.7.15"
     ember-text-measurer "^0.3.3"
     ember-truth-helpers "^1.2.0"
 
@@ -2658,9 +2638,9 @@ ember-try@^0.2.2, ember-try@^0.2.6:
     semver "^5.1.0"
     sync-exec "^0.6.2"
 
-ember-wormhole@0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/ember-wormhole/-/ember-wormhole-0.4.1.tgz#55fafaad20a650d21f6583a0e59c060a65338111"
+ember-wormhole@0.5.1, ember-wormhole@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/ember-wormhole/-/ember-wormhole-0.5.1.tgz#f2a6fff13b1c037ffa83b2c9291d8b5978878e5b"
   dependencies:
     ember-cli-babel "^5.1.6"
     ember-cli-htmlbars "^1.0.3"
@@ -3119,7 +3099,7 @@ fresh@0.3.0:
 
 fs-exists-sync@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
+  resolved "http://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
 
 fs-extra@0.30.0, fs-extra@^0.30.0:
   version "0.30.0"
@@ -4350,6 +4330,10 @@ lodash.merge@^4.3.0, lodash.merge@^4.4.0, lodash.merge@^4.5.1:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
 
+lodash.mergewith@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
+
 lodash.omit@^4.1.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
@@ -4830,9 +4814,9 @@ node-notifier@^4.3.1:
     shellwords "^0.1.0"
     which "^1.0.5"
 
-node-sass@^3.8.0:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-3.13.1.tgz#7240fbbff2396304b4223527ed3020589c004fc2"
+node-sass@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.1.1.tgz#dc3e27d25bd827b6276ea243be357c7c7cd07111"
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -4843,6 +4827,7 @@ node-sass@^3.8.0:
     in-publish "^2.0.0"
     lodash.assign "^4.2.0"
     lodash.clonedeep "^4.3.2"
+    lodash.mergewith "^4.6.0"
     meow "^3.7.0"
     mkdirp "^0.5.1"
     nan "^2.3.2"
@@ -4850,6 +4835,7 @@ node-sass@^3.8.0:
     npmlog "^4.0.0"
     request "^2.61.0"
     sass-graph "^2.1.1"
+    stdout-stream "^1.4.0"
 
 node-uuid@1.4.7, node-uuid@^1.4.3, node-uuid@~1.4.0, node-uuid@~1.4.7:
   version "1.4.7"
@@ -5665,7 +5651,7 @@ read@1, read@~1.0.1, read@~1.0.7:
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@1 || 2", readable-stream@^2, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.1.0, readable-stream@^2.1.5:
+"readable-stream@1 || 2", readable-stream@^2, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.0, readable-stream@^2.1.5:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
   dependencies:
@@ -6401,6 +6387,12 @@ statuses@1, "statuses@>= 1.3.1 < 2", statuses@~1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
+stdout-stream@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b"
+  dependencies:
+    readable-stream "^2.0.1"
+
 stream-browserify@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
@@ -6580,8 +6572,8 @@ temp@0.8.3:
     rimraf "~2.2.6"
 
 testem@^1.8.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/testem/-/testem-1.14.1.tgz#2749dde585bd8dcacf5dcfd8039c85f519fd46e6"
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/testem/-/testem-1.14.2.tgz#0c29f82e99cebf51c1a5808e57a922b9624075af"
   dependencies:
     backbone "^1.1.2"
     bluebird "^3.4.6"
@@ -6589,7 +6581,6 @@ testem@^1.8.1:
     commander "^2.6.0"
     consolidate "^0.14.0"
     cross-spawn "^5.0.0"
-    did_it_work "0.0.6"
     express "^4.10.7"
     fireworm "^0.7.0"
     glob "^7.0.4"
@@ -6779,7 +6770,7 @@ umask@~1.1.0:
 
 umd@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.1.tgz#8ae556e11011f63c2596708a8837259f01b3d60e"
+  resolved "http://registry.npmjs.org/umd/-/umd-3.0.1.tgz#8ae556e11011f63c2596708a8837259f01b3d60e"
 
 underscore.string@~2.3.3:
   version "2.3.3"
diff --git a/web/app/pods/components/huegasm-footer/template.hbs b/web/app/pods/components/huegasm-footer/template.hbs
index adece35..9ad0fb3 100644
--- a/web/app/pods/components/huegasm-footer/template.hbs
+++ b/web/app/pods/components/huegasm-footer/template.hbs
@@ -8,6 +8,6 @@
     </a>
 </div>
 
-<a href="https://play.google.com/store/apps/details?id=com.nidratech.huegasm" target="_blank" rel="noopener noreferrer">
+<a href="https://play.google.com/store/apps/details?id=com.hoboman313.huegasm" target="_blank" rel="noopener noreferrer">
     <img src="assets/images/google-play-badge.png" alt="Get it on the Google Play Store">
 </a>
\ No newline at end of file
diff --git a/web/app/pods/components/music-tab/component.js b/web/app/pods/components/music-tab/component.js
index 9fb44f6..139e00e 100644
--- a/web/app/pods/components/music-tab/component.js
+++ b/web/app/pods/components/music-tab/component.js
@@ -224,6 +224,8 @@ export default Component.extend(helperMixin, visualizerMixin, {
       }
     });
 
+    this.set('oldPlayQueueLength', this.get('playQueue.length'));
+
     SC.initialize({
       client_id: this.get('SC_CLIENT_ID')
     });
diff --git a/web/app/pods/components/music-tab/mixins/helpers.js b/web/app/pods/components/music-tab/mixins/helpers.js
index 8a47b7b..279454b 100644
--- a/web/app/pods/components/music-tab/mixins/helpers.js
+++ b/web/app/pods/components/music-tab/mixins/helpers.js
@@ -5,6 +5,7 @@ const {
   observer,
   computed,
   isNone,
+  run,
   $,
   inject,
   on,
@@ -171,8 +172,12 @@ export default Mixin.create({
 
     if(playQueuePointer !== -1 && currentVisName === 'None'){
       let song = playQueue[playQueuePointer];
-      if(song.scUrl && !isNone(song.picture)){
-        pic = song.picture.replace('67x67', '500x500');
+      if(!isNone(song.picture)){
+        pic = song.picture;
+
+        if(song.scUrl){
+          pic = pic.replace('67x67', '500x500');
+        }
       }
     }
 
@@ -275,13 +280,36 @@ export default Mixin.create({
     return this.formatTime(this.get('timeTotal'));
   }),
 
+  onPlayQueueChange: observer('playQueue.length', function(){
+    let playQueueLength = this.get('playQueue.length');
+
+    if(playQueueLength > this.get('oldPlayQueueLength')){
+      run.once(this, ()=>{
+        run.next(this, function() {
+          $(`.track${playQueueLength-1}`).velocity('scroll', { container: $('#play-list-area'), duration: 200 });
+        });
+      });
+    }
+
+    this.set('oldPlayQueueLength', playQueueLength);
+  }),
+
   onColorloopModeChange: observer('colorloopMode', 'playing', function(){
     this.set('colorLoopOn', this.get('playing') && this.get('colorloopMode'));
   }),
 
   onOptionChange: observer('flashingTransitions', 'playQueue.[]', 'playQueuePointer', 'colorloopMode', 'ambienceMode', function(self, option){
     option = option.replace('.[]', '');
-    this.get('storage').set('huegasm.' + option, this.get(option));
+    let value = this.get(option);
+
+    // can't really save local music
+    if(option === 'playQueue'){
+      value = value.filter((song)=>{
+        return !song.url.startsWith('blob:');
+      });
+    }
+
+    this.get('storage').set('huegasm.' + option, value);
   }),
 
   onRepeatChange: on('init', observer('repeat', function () {
diff --git a/web/app/styles/music-tab.scss b/web/app/styles/music-tab.scss
index 20cc5d3..5aeb483 100644
--- a/web/app/styles/music-tab.scss
+++ b/web/app/styles/music-tab.scss
@@ -246,7 +246,7 @@
   .audio-remove-button {
     position: absolute;
     top: 10px;
-    right: 0;
+    right: 5px;
     padding: 10px;
   }
 }
diff --git a/web/yarn.lock b/web/yarn.lock
index 37dac61..f523e9e 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -85,6 +85,13 @@ ansistyles@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz#5de60415bda071bb37127854c864f41b23254539"
 
+anymatch@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507"
+  dependencies:
+    arrify "^1.0.0"
+    micromatch "^2.1.5"
+
 aproba@^1.0.3, aproba@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.0.4.tgz#2713680775e7614c8ba186c065d4e2e52d1072c0"
@@ -153,6 +160,10 @@ arraybuffer.slice@0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"
 
+arrify@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+
 asap@^2.0.0, asap@~2.0.4:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.5.tgz#522765b50c3510490e52d7dcfe085ef9ba96958f"
@@ -389,10 +400,6 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-benchmark@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/benchmark/-/benchmark-1.0.0.tgz#2f1e2fa4c359f11122aa183082218e957e390c73"
-
 better-assert@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
@@ -428,8 +435,8 @@ bluebird@^2.9.33:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
 
 bluebird@^3.1.1, bluebird@^3.4.6:
-  version "3.4.6"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.6.tgz#01da8d821d87813d158967e743d5fe6c62cf8c0f"
+  version "3.4.7"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"
 
 body@^5.1.0:
   version "5.1.0"
@@ -527,8 +534,8 @@ broccoli-brocfile-loader@^0.18.0:
     findup-sync "^0.4.2"
 
 broccoli-builder@^0.18.0:
-  version "0.18.2"
-  resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.2.tgz#2093ca0b1ac793e30d0810913399da98fb2d0667"
+  version "0.18.3"
+  resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.3.tgz#9d2c90558e7f4d1118ae6e938c63b35da00dd38f"
   dependencies:
     heimdalljs "^0.2.0"
     promise-map-series "^0.2.1"
@@ -706,8 +713,8 @@ broccoli-middleware@^0.18.1:
     mime "^1.2.11"
 
 broccoli-persistent-filter@^1.0.1, broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.2.0:
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.2.11.tgz#95cc6b0b0eb0dcce5f8e6ae18f6a3cc45a06bf40"
+  version "1.2.12"
+  resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.2.12.tgz#e5fbba9d063969f74908d5ea2d0ea9940962e463"
   dependencies:
     async-disk-cache "^1.0.0"
     blank-object "^1.0.1"
@@ -741,14 +748,14 @@ broccoli-plugin@^1.0.0, broccoli-plugin@^1.2.0, broccoli-plugin@^1.2.1, broccoli
     rimraf "^2.3.4"
     symlink-or-copy "^1.1.8"
 
-broccoli-sass-source-maps@^1.8.0:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-1.8.1.tgz#115e32be25dc5f1686af1c8d1fa4c4c62749f0b6"
+broccoli-sass-source-maps@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-2.0.0.tgz#7f25f9f4b296918cec6e00672c63e75abce33d45"
   dependencies:
     broccoli-caching-writer "^3.0.3"
     include-path-searcher "^0.1.0"
     mkdirp "^0.3.5"
-    node-sass "^3.8.0"
+    node-sass "^4.1.0"
     object-assign "^2.0.0"
     rsvp "^3.0.6"
 
@@ -789,8 +796,8 @@ broccoli-stew@^1.2.0, broccoli-stew@^1.3.3:
     walk-sync "^0.3.0"
 
 broccoli-uglify-sourcemap@^1.0.0:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-1.4.2.tgz#1e280afbdfaa700b2f42155f6c4a036c37e61ca7"
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-1.5.1.tgz#9fd2e87f1c177b11a758e73c3a11d6a03d90d086"
   dependencies:
     broccoli-plugin "^1.2.1"
     debug "^2.2.0"
@@ -799,7 +806,7 @@ broccoli-uglify-sourcemap@^1.0.0:
     mkdirp "^0.5.0"
     source-map-url "^0.3.0"
     symlink-or-copy "^1.0.1"
-    uglify-js "^2.6.0"
+    uglify-js "^2.7.0"
     walk-sync "^0.1.3"
 
 broccoli-writer@^0.1.1:
@@ -871,8 +878,8 @@ can-symlink@^1.0.0:
     tmp "0.0.28"
 
 caniuse-db@^1.0.30000153, caniuse-db@^1.0.30000214:
-  version "1.0.30000600"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000600.tgz#2d0892f77eebb399c3c17b3ecb72da7b8740f31f"
+  version "1.0.30000602"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000602.tgz#06b2cbfb6c3aeef7ddb18cd588043549ad1a2d4e"
 
 capture-exit@^1.0.4:
   version "1.1.0"
@@ -1099,9 +1106,9 @@ component-emitter@1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.1.2.tgz#296594f2753daa63996d2af08d15a95116c9aec3"
 
-component-emitter@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.0.tgz#ccd113a86388d06482d03de3fc7df98526ba8efe"
+component-emitter@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
 
 component-inherit@0.0.3:
   version "0.0.3"
@@ -1129,12 +1136,12 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
 concat-stream@^1.4.7, concat-stream@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266"
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
   dependencies:
-    inherits "~2.0.1"
-    readable-stream "~2.0.0"
-    typedarray "~0.0.5"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
 
 config-chain@~1.1.10:
   version "1.1.11"
@@ -1226,11 +1233,12 @@ cross-spawn@^3.0.0:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
-cross-spawn@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
+cross-spawn@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.0.1.tgz#a3bbb302db2297cbea3c04edf36941f4613aa399"
   dependencies:
     lru-cache "^4.0.1"
+    shebang-command "^1.2.0"
     which "^1.2.9"
 
 cryptiles@2.x.x:
@@ -1261,19 +1269,21 @@ date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
-debug@0.7.4:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
-
 debug@2.2.0, debug@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
   dependencies:
     ms "0.7.1"
 
+debug@2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.3.tgz#40c453e67e6e13c901ddec317af8986cda9eff8c"
+  dependencies:
+    ms "0.7.2"
+
 debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0:
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.4.5.tgz#34c7b12a1ca96674428f41fe92c49b4ce7cd0607"
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
   dependencies:
     ms "0.7.2"
 
@@ -1354,10 +1364,6 @@ dezalgo@^1.0.0, dezalgo@^1.0.1, dezalgo@~1.0.3:
     asap "^2.0.0"
     wrappy "1"
 
-did_it_work@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/did_it_work/-/did_it_work-0.0.6.tgz#5180cb9e16ebf9a8753a0cc6b4af9ccdff71ec05"
-
 diff@^1.3.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
@@ -1420,13 +1426,13 @@ ember-ajax@^2.0.1:
   dependencies:
     ember-cli-babel "^5.1.5"
 
-ember-basic-dropdown@^0.16.0:
-  version "0.16.4"
-  resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-0.16.4.tgz#6bf84654e4bbcf375c2a35cd341432d901c02ab5"
+ember-basic-dropdown@^0.19.1, ember-basic-dropdown@^0.19.2:
+  version "0.19.2"
+  resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-0.19.2.tgz#c1fbf90c3702f44b564b2d85d05ad2ee3c6a4e90"
   dependencies:
     ember-cli-babel "^5.1.10"
-    ember-cli-htmlbars "^1.1.0"
-    ember-wormhole "0.4.1"
+    ember-cli-htmlbars "^1.1.1"
+    ember-wormhole "^0.5.1"
 
 ember-cli-app-version@^2.0.0:
   version "2.0.1"
@@ -1446,7 +1452,7 @@ ember-cli-babel@5.1.10:
     ember-cli-version-checker "^1.0.2"
     resolve "^1.1.2"
 
-ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.3, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7:
+ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.3, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7, ember-cli-babel@^5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.1.tgz#14a1a7b3ae9e9f1284f7bcdb142eb53bd0b1b5bd"
   dependencies:
@@ -1491,7 +1497,7 @@ ember-cli-htmlbars-inline-precompile@^0.3.1:
     ember-cli-htmlbars "^1.0.0"
     hash-for-dep "^1.0.2"
 
-ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.1, ember-cli-htmlbars@^1.0.10, ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.0.8, ember-cli-htmlbars@^1.1.0:
+ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.1, ember-cli-htmlbars@^1.0.10, ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.0.8, ember-cli-htmlbars@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-1.1.1.tgz#8776cf59796dac8f32e8625fc6d1ea45ffa55de1"
   dependencies:
@@ -1593,13 +1599,13 @@ ember-cli-release@0.2.8:
     semver "^4.3.1"
     silent-error "^1.0.0"
 
-ember-cli-sass@^5.2.1:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-5.6.0.tgz#792de67544bb903eef421a3e59c484840fea5352"
+ember-cli-sass@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-6.0.0.tgz#31c9c8fa789c0d25aaf8e315431b7a3ec4ba0175"
   dependencies:
     broccoli-funnel "^1.0.0"
     broccoli-merge-trees "^1.1.0"
-    broccoli-sass-source-maps "^1.8.0"
+    broccoli-sass-source-maps "^2.0.0"
     ember-cli-babel "5.1.10"
     ember-cli-version-checker "^1.0.2"
     merge "^1.2.0"
@@ -1621,8 +1627,10 @@ ember-cli-test-info@^1.0.0:
     ember-cli-string-utils "^1.0.0"
 
 ember-cli-test-loader@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-1.1.0.tgz#54850145b311e7ac0f990cbd461a028012700441"
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-1.1.1.tgz#333311209b18185d0e0e95f918349da10cacf0b1"
+  dependencies:
+    ember-cli-babel "^5.2.1"
 
 ember-cli-uglify@^1.2.0:
   version "1.2.0"
@@ -1727,15 +1735,15 @@ ember-cli@^2.8.0:
     walk-sync "^0.3.0"
     yam "0.0.22"
 
-ember-composability-tools@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/ember-composability-tools/-/ember-composability-tools-0.0.5.tgz#d41026fef58f7cb18cc3b4722596ce09d7ec629f"
+ember-composability-tools@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/ember-composability-tools/-/ember-composability-tools-0.0.6.tgz#38f1b6fc4ea7edde4147f7124913ff6b078d2961"
   dependencies:
     ember-cli-babel "^5.1.6"
     ember-cli-htmlbars "^1.0.3"
-    ember-wormhole "0.4.1"
+    ember-wormhole "0.5.1"
 
-ember-concurrency@^0.7.9:
+ember-concurrency@^0.7.15:
   version "0.7.17"
   resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.7.17.tgz#28f963c96fa5d1c42bb4b239c0212220d849738f"
   dependencies:
@@ -1743,9 +1751,9 @@ ember-concurrency@^0.7.9:
     ember-getowner-polyfill "^1.1.0"
     ember-maybe-import-regenerator "^0.1.4"
 
-ember-css-transitions@0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/ember-css-transitions/-/ember-css-transitions-0.1.8.tgz#2c9454b4cc1db367849a4f8a7e8c4b082bb97d19"
+ember-css-transitions@0.1.9:
+  version "0.1.9"
+  resolved "https://registry.yarnpkg.com/ember-css-transitions/-/ember-css-transitions-0.1.9.tgz#280caa7aaf2132abbeb3c960fc64ba11cf303d81"
   dependencies:
     ember-cli-babel "^5.1.6"
 
@@ -1795,32 +1803,32 @@ ember-notify@^5.0.4:
     ember-string-ishtmlsafe-polyfill "1.0.1"
     object-assign "^4.1.0"
 
-ember-paper@^1.0.0-alpha.11:
-  version "1.0.0-alpha.12"
-  resolved "https://registry.yarnpkg.com/ember-paper/-/ember-paper-1.0.0-alpha.12.tgz#9d686e5a05afd89f3143c0e72153d9c7f02b5b2a"
+ember-paper@^1.0.0-alpha.12:
+  version "1.0.0-alpha.13"
+  resolved "https://registry.yarnpkg.com/ember-paper/-/ember-paper-1.0.0-alpha.13.tgz#44d20f5b63f3405c803501ca4e35cc509d65e15d"
   dependencies:
     angular-material-source angular/material#v1.0.6
     broccoli-autoprefixer "^3.0.0"
     broccoli-filter "^1.2.3"
     broccoli-funnel "^1.0.1"
     broccoli-merge-trees "^1.1.0"
-    ember-basic-dropdown "^0.16.0"
+    ember-basic-dropdown "^0.19.2"
     ember-cli-babel "^5.1.7"
-    ember-composability-tools "0.0.5"
-    ember-css-transitions "0.1.8"
-    ember-power-select "1.0.0-beta.23"
-    ember-wormhole "0.4.1"
+    ember-composability-tools "0.0.6"
+    ember-css-transitions "0.1.9"
+    ember-power-select "1.0.3"
+    ember-wormhole "0.5.1"
     resolve "^1.1.7"
     virtual-each "0.3.1"
 
-ember-power-select@1.0.0-beta.23:
-  version "1.0.0-beta.23"
-  resolved "https://registry.yarnpkg.com/ember-power-select/-/ember-power-select-1.0.0-beta.23.tgz#a4fa05e352860c469c0dc1a44226064474232e6c"
+ember-power-select@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/ember-power-select/-/ember-power-select-1.0.3.tgz#2c907e964c1016f485095b4a32a72c9d30b26f35"
   dependencies:
-    ember-basic-dropdown "^0.16.0"
+    ember-basic-dropdown "^0.19.1"
     ember-cli-babel "^5.1.10"
-    ember-cli-htmlbars "^1.1.0"
-    ember-concurrency "^0.7.9"
+    ember-cli-htmlbars "^1.1.1"
+    ember-concurrency "^0.7.15"
     ember-text-measurer "^0.3.3"
     ember-truth-helpers "^1.2.0"
 
@@ -1896,9 +1904,9 @@ ember-try@^0.2.6:
     semver "^5.1.0"
     sync-exec "^0.6.2"
 
-ember-wormhole@0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/ember-wormhole/-/ember-wormhole-0.4.1.tgz#55fafaad20a650d21f6583a0e59c060a65338111"
+ember-wormhole@0.5.1, ember-wormhole@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/ember-wormhole/-/ember-wormhole-0.5.1.tgz#f2a6fff13b1c037ffa83b2c9291d8b5978878e5b"
   dependencies:
     ember-cli-babel "^5.1.6"
     ember-cli-htmlbars "^1.0.3"
@@ -1919,26 +1927,26 @@ encoding@^0.1.11:
   dependencies:
     iconv-lite "~0.4.13"
 
-engine.io-client@1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.7.0.tgz#0bb81d3563ab7afb668f1e1b400c9403b03006ee"
+engine.io-client@1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.0.tgz#7b730e4127414087596d9be3c88d2bc5fdb6cf5c"
   dependencies:
-    component-emitter "1.1.2"
+    component-emitter "1.2.1"
     component-inherit "0.0.3"
-    debug "2.2.0"
-    engine.io-parser "1.3.0"
+    debug "2.3.3"
+    engine.io-parser "1.3.1"
     has-cors "1.1.0"
     indexof "0.0.1"
-    parsejson "0.0.1"
-    parseqs "0.0.2"
-    parseuri "0.0.4"
+    parsejson "0.0.3"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
     ws "1.1.1"
-    xmlhttprequest-ssl "1.5.1"
+    xmlhttprequest-ssl "1.5.3"
     yeast "0.1.2"
 
-engine.io-parser@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-1.3.0.tgz#61a35c7f3a3ccd1b179e4f52257a7a8cfacaeb21"
+engine.io-parser@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-1.3.1.tgz#9554f1ae33107d6fbd170ca5466d2f833f6a07cf"
   dependencies:
     after "0.8.1"
     arraybuffer.slice "0.0.6"
@@ -1947,14 +1955,15 @@ engine.io-parser@1.3.0:
     has-binary "0.1.6"
     wtf-8 "1.0.0"
 
-engine.io@1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.7.0.tgz#a417857af4995d9bbdf8a0e03a87e473ebe64fbe"
+engine.io@1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.0.tgz#3eeb5f264cb75dbbec1baaea26d61f5a4eace2aa"
   dependencies:
     accepts "1.3.3"
     base64id "0.1.0"
-    debug "2.2.0"
-    engine.io-parser "1.3.0"
+    cookie "0.3.1"
+    debug "2.3.3"
+    engine.io-parser "1.3.1"
     ws "1.1.1"
 
 ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1:
@@ -2033,8 +2042,8 @@ esprima@~3.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9"
 
 esprima@~3.1.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.2.tgz#954b5d19321ca436092fa90f06d6798531fe8184"
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
 
 esutils@^2.0.0:
   version "2.0.2"
@@ -2283,7 +2292,7 @@ fresh@0.3.0:
 
 fs-exists-sync@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
+  resolved "http://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
 
 fs-extra@0.30.0, fs-extra@^0.30.0:
   version "0.30.0"
@@ -2430,7 +2439,11 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-git-repo-info@^1.0.4, git-repo-info@~1.2.0:
+git-repo-info@^1.0.4:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.4.0.tgz#ed210221defd3fdefce8b16ac61985cabe242e4a"
+
+git-repo-info@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.2.0.tgz#43d8513e04a24dd441330a2f7c6655a709fdbaf2"
 
@@ -2597,11 +2610,12 @@ has-unicode@^2.0.0, has-unicode@~2.0.1:
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
 
 hash-for-dep@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.0.4.tgz#8774e7b80c7c07be3bdc58b55278a4c6865d3737"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.1.2.tgz#e3347ed92960eb0bb53a2c6c2b70e36d75b7cd0c"
   dependencies:
     broccoli-kitchen-sink-helpers "^0.3.1"
     heimdalljs "^0.2.3"
+    heimdalljs-logger "^0.1.7"
     resolve "^1.1.6"
 
 hawk@~3.1.3:
@@ -2727,7 +2741,7 @@ inflight@^1.0.4, inflight@~1.0.5:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -2866,7 +2880,7 @@ is-obj@^1.0.0:
 
 is-posix-bracket@^0.1.0:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+  resolved "http://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
 
 is-primitive@^2.0.0:
   version "2.0.0"
@@ -3002,10 +3016,6 @@ json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
-json3@3.2.6:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.2.6.tgz#f6efc93c06a04de9aec53053df2559bb19e2038b"
-
 json3@3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
@@ -3025,8 +3035,8 @@ jsonify@~0.0.0:
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
 
 jsonpointer@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.0.tgz#6661e161d2fc445f19f98430231343722e1fcbd5"
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
 
 jsprim@^1.2.2:
   version "1.3.1"
@@ -3301,6 +3311,10 @@ lodash.merge@^4.3.0, lodash.merge@^4.4.0, lodash.merge@^4.5.1:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
 
+lodash.mergewith@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz#150cf0a16791f5903b8891eab154609274bdea55"
+
 lodash.omit@^4.1.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
@@ -3350,8 +3364,8 @@ lodash@^3.10.0, lodash@^3.10.1, lodash@^3.9.3:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
 lodash@^4.0.0, lodash@^4.14.0, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.6.1:
-  version "4.17.2"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42"
+  version "4.17.3"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.3.tgz#557ed7d2a9438cac5fd5a43043ca60cb455e01f7"
 
 lodash@~4.16.4:
   version "4.16.6"
@@ -3490,7 +3504,7 @@ methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
 
-micromatch@^2.3.7:
+micromatch@^2.1.5, micromatch@^2.3.7:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
   dependencies:
@@ -3603,8 +3617,8 @@ mute-stream@0.0.6, mute-stream@~0.0.4:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db"
 
 nan@^2.3.2:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.4.0.tgz#fb3c59d45fe4effe215f0b890f8adf6eb32d2232"
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.0.tgz#aa8f1e34531d807e9e27755b234b4a6ec0c152a8"
 
 negotiator@0.6.1:
   version "0.6.1"
@@ -3662,9 +3676,9 @@ node-notifier@^4.3.1:
     shellwords "^0.1.0"
     which "^1.0.5"
 
-node-sass@^3.8.0:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-3.13.1.tgz#7240fbbff2396304b4223527ed3020589c004fc2"
+node-sass@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.1.1.tgz#dc3e27d25bd827b6276ea243be357c7c7cd07111"
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -3675,6 +3689,7 @@ node-sass@^3.8.0:
     in-publish "^2.0.0"
     lodash.assign "^4.2.0"
     lodash.clonedeep "^4.3.2"
+    lodash.mergewith "^4.6.0"
     meow "^3.7.0"
     mkdirp "^0.5.1"
     nan "^2.3.2"
@@ -3682,6 +3697,7 @@ node-sass@^3.8.0:
     npmlog "^4.0.0"
     request "^2.61.0"
     sass-graph "^2.1.1"
+    stdout-stream "^1.4.0"
 
 node-uuid@^1.4.3, node-uuid@~1.4.7:
   version "1.4.7"
@@ -3853,14 +3869,14 @@ oauth-sign@~0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
+object-assign@4.1.0, object-assign@^4.0.1, object-assign@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
+
 object-assign@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa"
 
-object-assign@^4.0.1, object-assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
-
 object-component@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
@@ -3968,21 +3984,21 @@ parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
 
-parsejson@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.1.tgz#9b10c6c0d825ab589e685153826de0a3ba278bcc"
+parsejson@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.3.tgz#ab7e3759f209ece99437973f7d0f1f64ae0e64ab"
   dependencies:
     better-assert "~1.0.0"
 
-parseqs@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.2.tgz#9dfe70b2cddac388bde4f35b1f240fa58adbe6c7"
+parseqs@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
   dependencies:
     better-assert "~1.0.0"
 
-parseuri@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.4.tgz#806582a39887e1ea18dd5e2fe0e01902268e9350"
+parseuri@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
   dependencies:
     better-assert "~1.0.0"
 
@@ -4215,7 +4231,7 @@ read@1, read@~1.0.1, read@~1.0.7:
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@1 || 2", readable-stream@^2, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2:
+"readable-stream@1 || 2", readable-stream@^2, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
   dependencies:
@@ -4245,7 +4261,7 @@ readable-stream@~1.0.2:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@~2.0.0, readable-stream@~2.0.5:
+readable-stream@~2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
   dependencies:
@@ -4351,7 +4367,7 @@ regenerator@0.8.40:
 
 regex-cache@^0.4.2:
   version "0.4.3"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
+  resolved "http://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
   dependencies:
     is-equal-shallow "^0.1.3"
     is-primitive "^2.0.0"
@@ -4520,9 +4536,10 @@ safe-json-parse@~1.0.1:
   resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
 
 sane@^1.1.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/sane/-/sane-1.4.1.tgz#88f763d74040f5f0c256b6163db399bf110ac715"
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-1.5.0.tgz#a4adeae764d048621ecb27d5f9ecf513101939f3"
   dependencies:
+    anymatch "^1.3.0"
     exec-sh "^0.2.0"
     fb-watchman "^1.8.0"
     minimatch "^3.0.2"
@@ -4588,6 +4605,12 @@ sha@~2.0.1:
     graceful-fs "^4.1.2"
     readable-stream "^2.0.2"
 
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  dependencies:
+    shebang-regex "^1.0.0"
+
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
@@ -4632,59 +4655,49 @@ sntp@1.x.x:
   dependencies:
     hoek "2.x.x"
 
-socket.io-adapter@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz#fb9f82ab1aa65290bf72c3657955b930a991a24f"
+socket.io-adapter@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz#cb6d4bb8bec81e1078b99677f9ced0046066bb8b"
   dependencies:
-    debug "2.2.0"
-    socket.io-parser "2.2.2"
+    debug "2.3.3"
+    socket.io-parser "2.3.1"
 
-socket.io-client@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.5.0.tgz#08232d0adb5a665a7c24bd9796557a33f58f38ae"
+socket.io-client@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.6.0.tgz#5b668f4f771304dfeed179064708386fa6717853"
   dependencies:
     backo2 "1.0.2"
     component-bind "1.0.0"
-    component-emitter "1.2.0"
-    debug "2.2.0"
-    engine.io-client "1.7.0"
+    component-emitter "1.2.1"
+    debug "2.3.3"
+    engine.io-client "1.8.0"
     has-binary "0.1.7"
     indexof "0.0.1"
     object-component "0.0.3"
-    parseuri "0.0.4"
-    socket.io-parser "2.2.6"
+    parseuri "0.0.5"
+    socket.io-parser "2.3.1"
     to-array "0.1.4"
 
-socket.io-parser@2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-2.2.2.tgz#3d7af6b64497e956b7d9fe775f999716027f9417"
+socket.io-parser@2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-2.3.1.tgz#dd532025103ce429697326befd64005fcfe5b4a0"
   dependencies:
-    benchmark "1.0.0"
-    component-emitter "1.1.2"
-    debug "0.7.4"
-    isarray "0.0.1"
-    json3 "3.2.6"
-
-socket.io-parser@2.2.6:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-2.2.6.tgz#38dfd61df50dcf8ab1d9e2091322bf902ba28b99"
-  dependencies:
-    benchmark "1.0.0"
     component-emitter "1.1.2"
     debug "2.2.0"
     isarray "0.0.1"
     json3 "3.3.2"
 
-socket.io@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.5.0.tgz#024dd9719d9267d6a6984eebe2ab5ceb9a0b8a98"
+socket.io@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.6.0.tgz#3e40d932637e6bd923981b25caf7c53e83b6e2e1"
   dependencies:
-    debug "2.2.0"
-    engine.io "1.7.0"
+    debug "2.3.3"
+    engine.io "1.8.0"
     has-binary "0.1.7"
-    socket.io-adapter "0.4.0"
-    socket.io-client "1.5.0"
-    socket.io-parser "2.2.6"
+    object-assign "4.1.0"
+    socket.io-adapter "0.5.0"
+    socket.io-client "1.6.0"
+    socket.io-parser "2.3.1"
 
 sort-object-keys@^1.1.1:
   version "1.1.2"
@@ -4786,6 +4799,12 @@ stable@~0.1.3:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
+stdout-stream@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b"
+  dependencies:
+    readable-stream "^2.0.1"
+
 string-template@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
@@ -4808,7 +4827,7 @@ string_decoder@0.10, string_decoder@~0.10.x:
 
 stringmap@~0.2.2:
   version "0.2.2"
-  resolved "http://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz#556c137b258f942b8776f5b2ef582aa069d7d1b1"
+  resolved "https://registry.yarnpkg.com/stringmap/-/stringmap-0.2.2.tgz#556c137b258f942b8776f5b2ef582aa069d7d1b1"
 
 stringset@~0.2.1:
   version "0.2.1"
@@ -4876,12 +4895,11 @@ sync-exec@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/sync-exec/-/sync-exec-0.6.2.tgz#717d22cc53f0ce1def5594362f3a89a2ebb91105"
 
-tap-parser@^1.1.3:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-1.3.2.tgz#120c5089c88c3c8a793ef288867de321e18f8c22"
+tap-parser@^3.0.2:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-3.0.4.tgz#3d8fcce8aa3792276afd7d75a1b791981630b83f"
   dependencies:
     events-to-array "^1.0.1"
-    inherits "~2.0.1"
     js-yaml "^3.2.7"
   optionalDependencies:
     readable-stream "^2"
@@ -4902,16 +4920,15 @@ temp@0.8.3:
     rimraf "~2.2.6"
 
 testem@^1.8.1:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/testem/-/testem-1.13.0.tgz#441779b340afae4bd318d5c2be29b99d8964947f"
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/testem/-/testem-1.14.2.tgz#0c29f82e99cebf51c1a5808e57a922b9624075af"
   dependencies:
     backbone "^1.1.2"
     bluebird "^3.4.6"
     charm "^1.0.0"
     commander "^2.6.0"
     consolidate "^0.14.0"
-    cross-spawn "^4.0.0"
-    did_it_work "0.0.6"
+    cross-spawn "^5.0.0"
     express "^4.10.7"
     fireworm "^0.7.0"
     glob "^7.0.4"
@@ -4926,10 +4943,10 @@ testem@^1.8.1:
     npmlog "^4.0.0"
     printf "^0.2.3"
     rimraf "^2.4.4"
-    socket.io "1.5.0"
+    socket.io "1.6.0"
     spawn-args "^0.2.0"
     styled_string "0.0.1"
-    tap-parser "^1.1.3"
+    tap-parser "^3.0.2"
     xmldom "^0.1.19"
 
 text-table@~0.2.0:
@@ -5026,7 +5043,7 @@ type-is@~1.6.13:
     media-typer "0.3.0"
     mime-types "~2.1.13"
 
-typedarray@~0.0.5:
+typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
@@ -5034,7 +5051,7 @@ uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
 
-uglify-js@^2.6, uglify-js@^2.6.0:
+uglify-js@^2.6, uglify-js@^2.7.0:
   version "2.7.5"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8"
   dependencies:
@@ -5263,9 +5280,9 @@ xmldom@^0.1.19:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
 
-xmlhttprequest-ssl@1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz#3b7741fea4a86675976e908d296d4445961faa67"
+xmlhttprequest-ssl@1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d"
 
 xtend@^4.0.0, xtend@~4.0.0:
   version "4.0.1"