diff --git a/.travis.sh b/.travis.sh
index 31d68f3..b01853b 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -2,15 +2,6 @@
 
 set -e
 
-if [[ $BUILD == dub ]]; then
-    dub build --build=release --config=client
-    dub build --build=release --config=server
-elif [[ $DC == ldc2 ]]; then
-    git submodule update --init --recursive
-    make ldc -j2
-else
-    git submodule update --init --recursive
-    make debug -j2
-fi
+make
 
 cd tests && ./run_tests.sh
diff --git a/.travis.yml b/.travis.yml
index a5ac3ac..35e6742 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,17 +3,10 @@ sudo: false
 language: d
 d:
   - dmd
-  - ldc-beta
   - ldc
 
 os:
   - linux
-# TODO, some bug in OSX for the server that causes it to fail
-#  - osx
-
-env:
-  - BUILD=
-  - BUILD=dub
 
 branches:
   only:
@@ -21,76 +14,3 @@ branches:
   - /^v\d+\.\d+\.\d+([+-]\S*)*$/
 
 script: ./.travis.sh
-jobs:
-  include:
-    - stage: GitHub Release
-      #if: tag IS present
-      d: ldc-1.13.0
-      os: linux
-      script: echo "Deploying to GitHub releases ..." && ./release.sh
-      deploy:
-        provider: releases
-        api_key: $GH_REPO_TOKEN
-        file_glob: true
-        file: bin/dcd-*.tar.gz
-        skip_cleanup: true
-        on:
-          repo: dlang-community/DCD
-          tags: true
-    - stage: GitHub Release
-      #if: tag IS present
-      d: ldc-1.13.0
-      os: osx
-      script: echo "Deploying to GitHub releases ..." && ./release.sh
-      deploy:
-        provider: releases
-        api_key: $GH_REPO_TOKEN
-        file_glob: true
-        file: bin/dcd-*.tar.gz
-        skip_cleanup: true
-        on:
-          repo: dlang-community/DCD
-          tags: true
-    - stage: GitHub Release
-      #if: tag IS present
-      d: dmd
-      os: linux
-      language: generic
-      sudo: yes
-      script: echo "Deploying to GitHub releases ..." && ./release-windows.sh
-      addons:
-        apt:
-          packages:
-            - p7zip-full
-        deploy:
-          provider: releases
-          api_key: $GH_REPO_TOKEN
-          file_glob: true
-          file: bin/dcd-*.zip
-          skip_cleanup: true
-          on:
-            repo: dlang-community/DCD
-            tags: true
-    - stage: GitHub Release
-      #if: tag IS present
-      d: dmd
-      os: linux
-      language: generic
-      sudo: yes
-      script: echo "Deploying to GitHub releases ..." && ARCH=64 ./release-windows.sh
-      addons:
-        apt:
-          packages:
-            - p7zip-full
-        deploy:
-          provider: releases
-          api_key: $GH_REPO_TOKEN
-          file_glob: true
-          file: bin/dcd-*.zip
-          skip_cleanup: true
-          on:
-            repo: dlang-community/DCD
-            tags: true
-stages:
-  - name: test
-    if: type = pull_request or (type = push and branch = master)
diff --git a/makefile b/makefile
index 2bf0be9..47b60c7 100644
--- a/makefile
+++ b/makefile
@@ -97,7 +97,9 @@ DMD_SERVER_FLAGS := -Icontainers/src\
 	-O\
 	-release\
 	-inline\
-	-ofbin/dcd-server
+	-ofbin/dcd-server\
+	-dip25\
+	-dip1000
 
 DEBUG_SERVER_FLAGS := -Icontainers/src\
 	-Imsgpack-d/src\
diff --git a/msgpack-d b/msgpack-d
index 19d9245..19c9f2f 160000
--- a/msgpack-d
+++ b/msgpack-d
@@ -1 +1 @@
-Subproject commit 19d9245e315a85763754ded6912c2375c9226e04
+Subproject commit 19c9f2fc1dc2c392d32a5ac71b91c27b400fa5a3