diff --git a/.travis.yml b/.travis.yml
index 06ae43e..c0c4b4d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,8 @@
 language: php
 php:
-  - hhvm
   - 7.1
   - 7.0
-  - 5.6
-  - 5.5
-  - 5.4
-  - 5.3
 
-matrix:
-  allow_failures:
-    - php: hhvm
 
 before_script:
   - composer install --dev --no-interaction
diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 0000000..26e09b6
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,31 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure(2) do |config|
+
+	# It seems to need this here or "destroy" errors.
+	config.vm.box = "boxcutter/ubuntu1604"
+
+
+	config.vm.define "app" do |normal|
+
+		config.vm.box = "boxcutter/ubuntu1604"
+		config.vm.box_version = "2.0.18"
+
+
+		config.vm.synced_folder ".", "/vagrant",  :owner=> 'vagrant', :group=>'users', :mount_options => ['dmode=777', 'fmode=777']
+
+		config.vm.provider "virtualbox" do |vb|
+			# Display the VirtualBox GUI when booting the machine
+			vb.gui = false
+
+			# Customize the amount of memory on the VM:
+			vb.memory = "1024"
+		end
+
+		config.vm.provision :shell, path: "vagrant/app/bootstrap.sh"
+
+	end
+
+
+end
diff --git a/composer.json b/composer.json
index 5728f6e..18933df 100644
--- a/composer.json
+++ b/composer.json
@@ -13,8 +13,13 @@
             "role": "Developer"
         }
     ],
+    "config": {
+      "platform": {
+        "php": "7.0.0"
+      }
+    },
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=7.0.0",
         "misd/linkify": "1.1.*",
         "twig/twig": "2.*"
     },
diff --git a/composer.lock b/composer.lock
index daece4c..3842f05 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,28 +4,27 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "345c06ab88bffd803915aa9612103e7c",
-    "content-hash": "9b60b5bbcdedaf481cfb59e2f6dab7eb",
+    "content-hash": "498bddb7e6bbadda04f0eb25bc0c8780",
     "packages": [
         {
             "name": "misd/linkify",
-            "version": "v1.1.2",
+            "version": "v1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/misd-service-development/php-linkify.git",
-                "reference": "4dbe3e9f966e446a257d0f60a91f39e0b7f4f4d6"
+                "reference": "78c0da54f3e772cc569bb88d8dc8c46413bce4e7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/misd-service-development/php-linkify/zipball/4dbe3e9f966e446a257d0f60a91f39e0b7f4f4d6",
-                "reference": "4dbe3e9f966e446a257d0f60a91f39e0b7f4f4d6",
+                "url": "https://api.github.com/repos/misd-service-development/php-linkify/zipball/78c0da54f3e772cc569bb88d8dc8c46413bce4e7",
+                "reference": "78c0da54f3e772cc569bb88d8dc8c46413bce4e7",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0"
+                "phpunit/phpunit": "^4.0 || ^5.0"
             },
             "type": "library",
             "extra": {
@@ -34,20 +33,14 @@
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Misd\\Linkify\\": "src/"
+                "psr-4": {
+                    "Misd\\Linkify\\": "src/Misd/Linkify"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
-            "authors": [
-                {
-                    "name": "Chris Wilkinson",
-                    "email": "chris.wilkinson@admin.cam.ac.uk"
-                }
-            ],
             "description": "Converts URLs and email addresses in text into HTML links",
             "homepage": "https://github.com/misd-service-development/php-linkify",
             "keywords": [
@@ -56,38 +49,102 @@
                 "link",
                 "url"
             ],
-            "time": "2014-05-12 11:52:18"
+            "time": "2017-02-18T13:30:02+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "f29dca382a6485c3cbe6379f0c61230167681937"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f29dca382a6485c3cbe6379f0c61230167681937",
+                "reference": "f29dca382a6485c3cbe6379f0c61230167681937",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2017-06-09T14:24:12+00:00"
         },
         {
             "name": "twig/twig",
-            "version": "v1.23.1",
+            "version": "v2.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6"
+                "reference": "eab7c3288ae6603d7d6f92b531626af2b162d1f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/d9b6333ae8dd2c8e3fd256e127548def0bc614c6",
-                "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/eab7c3288ae6603d7d6f92b531626af2b162d1f2",
+                "reference": "eab7c3288ae6603d7d6f92b531626af2b162d1f2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.2.7"
+                "php": "^7.0",
+                "symfony/polyfill-mbstring": "~1.0"
             },
             "require-dev": {
+                "psr/container": "^1.0",
                 "symfony/debug": "~2.7",
-                "symfony/phpunit-bridge": "~2.7"
+                "symfony/phpunit-bridge": "~3.3@dev"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.23-dev"
+                    "dev-master": "2.4-dev"
                 }
             },
             "autoload": {
                 "psr-0": {
                     "Twig_": "lib/"
+                },
+                "psr-4": {
+                    "Twig\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -117,7 +174,7 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2015-11-05 12:49:06"
+            "time": "2017-06-07T18:47:58+00:00"
         }
     ],
     "packages-dev": [],
@@ -127,7 +184,10 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=5.3.0"
+        "php": ">=7.0.0"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "platform-overrides": {
+        "php": "7.0.0"
+    }
 }
diff --git a/vagrant/app/bootstrap.sh b/vagrant/app/bootstrap.sh
new file mode 100644
index 0000000..3bdcf78
--- /dev/null
+++ b/vagrant/app/bootstrap.sh
@@ -0,0 +1,8 @@
+
+sudo apt-get update
+sudo apt-get install -y php phpunit git zip
+
+mkdir /home/vagrant/bin
+cd /home/vagrant/bin
+wget -q https://getcomposer.org/composer.phar
+