diff --git a/.travis.yml b/.travis.yml
index eacb31d..c558b34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,6 @@
 
 
 language: python
-dist: trusty
 sudo: required
 cache:
   # See http://docs.travis-ci.com/user/caching/#pip-cache
@@ -62,7 +61,7 @@ addons:
 
 matrix:
   include:
-    - python: 3.6
+    - python: 3.7
       env:
         - TEST_TARGET=test
 
diff --git a/.travis/travis_install.sh b/.travis/travis_install.sh
index 44c2dff..337ea5f 100755
--- a/.travis/travis_install.sh
+++ b/.travis/travis_install.sh
@@ -14,7 +14,7 @@ hash -d pip  # find upgraded pip
 section_end "install.base.requirements"
 
 section "install.baselayer.requirements"
-npm -g install npm@4.2.0
+npm -g install npm@5.8.0
 npm --version
 node --version
 
diff --git a/baselayer b/baselayer
index b969743..0371d75 160000
--- a/baselayer
+++ b/baselayer
@@ -1 +1 @@
-Subproject commit b9697431cc914601ce7ec2386ada641429f7addf
+Subproject commit 0371d7507f1186a03a9a331661c557ba83b0b412