diff --git a/Gruntfile.js b/Gruntfile.js
index 83d7ad809e6..89a54f17a07 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -50,12 +50,13 @@ module.exports = function(grunt) {
             'session': './packages/session/session',
             'kujua-sms/utils': './packages/kujua-sms/kujua-sms/utils',
             'views/lib/objectpath': './packages/kujua-sms/views/lib/objectpath',
-            'text!enketo-config': './static/js/enketo/config.json',
+            'enketo-config': './static/js/enketo/config.json',
             'widgets': './static/js/enketo/widgets',
             './xpath-evaluator-binding':'./static/js/enketo/OpenrosaXpathEvaluatorBinding',
             'extended-xpath': './node_modules/openrosa-xpath-evaluator/src/extended-xpath',
             'openrosa-xpath-extensions': './node_modules/openrosa-xpath-evaluator/src/openrosa-xpath-extensions',
             'translator': './static/js/enketo/translator', // translator for enketo's internal i18n
+            '../../js/dropdown.jquery': 'bootstrap/js/dropdown', // enketo currently duplicates bootstrap's dropdown code.  working to resolve this upstream https://github.com/enketo/enketo-core/issues/454
             'libphonenumber/utils': './packages/libphonenumber/libphonenumber/utils',
             'libphonenumber/libphonenumber': './packages/libphonenumber/libphonenumber/libphonenumber',
             'worker-pouch/workerified': './node_modules/worker-pouch/lib/workerified/',
@@ -143,6 +144,7 @@ module.exports = function(grunt) {
             cwd: 'node_modules',
             src: [
               'bootstrap-daterangepicker/**',
+              'enketo-core/**',
               'font-awesome/**',
               'moment/**',
               'pouchdb-adapter-idb/**',
@@ -173,9 +175,6 @@ module.exports = function(grunt) {
       }
     },
     exec: {
-      dedupe_jquery: {
-        cmd: 'rm -rf node_modules/@medic/enketo-core/node_modules/jquery'
-      },
       deploy: {
         cmd: 'kanso push $COUCH_URL'
       },
@@ -214,6 +213,7 @@ module.exports = function(grunt) {
         cmd: function() {
           var modulesToPatch = [
             'bootstrap-daterangepicker',
+            'enketo-core',
             'font-awesome',
             'moment',
             'pouchdb-adapter-idb',
@@ -251,6 +251,13 @@ module.exports = function(grunt) {
             // patch pouch to improve safari checks
             // https://github.com/medic/medic-webapp/issues/2797
             'patch node_modules/pouchdb-adapter-idb/lib/index.js < patches/pouchdb-ignore-safari-check.patch',
+
+            // patch enketo to support cascading of jr:choice-name() update results
+            // https://github.com/medic/medic-webapp/issues/3804
+            'patch node_modules/enketo-core/src/js/output.js < patches/3804_jr-choice-name.patch',
+
+            // patch enketo's bootstrap-datepicker dependency so that sass compiles properly
+            'patch node_modules/enketo-core/src/widget/date/datepicker-extended.scss < patches/enketo-datepicker-extended-sass-import.patch',
           ];
           return patches.join(' && ');
         }
@@ -411,7 +418,6 @@ module.exports = function(grunt) {
   grunt.registerTask('mmnpm', 'Update and patch npm dependencies', [
     'exec:undopatches',
     'auto_install:npm',
-    'exec:dedupe_jquery',
     'copy:librariestopatch',
     'exec:applypatches'
   ]);
diff --git a/demo-forms/jr-choice-name.xml b/demo-forms/jr-choice-name.xml
new file mode 100644
index 00000000000..63fc463d22a
--- /dev/null
+++ b/demo-forms/jr-choice-name.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<h:html xmlns="http://www.w3.org/2002/xforms" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:jr="http://openrosa.org/javarosa" xmlns:orx="http://openrosa.org/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+  <!--
+    This form is taken from https://github.com/enketo/enketo-core/issues/412 and
+    demonstrates how jr:choice-name() can create problems with property updates.
+  -->
+
+  <h:head>
+    <h:title>Test Issue 3281</h:title>
+    <model>
+      <instance>
+        <issue-3281 delimiter="#" id="issue_3281" prefix="J1!issue_3281!" version="2017-03-24">
+          <input>Default Value</input>
+          <translator>clinic</translator><output/><debug/>
+          <note/>
+          <meta>
+            <instanceID/>
+          </meta>
+        </issue-3281>
+      </instance>
+      <bind nodeset="/issue-3281/input" type="string"/>
+      <bind nodeset="/issue-3281/translator" type="select1"/>
+      <bind calculate="jr:choice-name( /issue-3281/translator ,' /issue-3281/translator ')" nodeset="/issue-3281/output" type="string"/>
+      <bind nodeset="/issue-3281/debug" readonly="true()" type="string"/>
+      <bind nodeset="/issue-3281/note" readonly="true()" type="string"/>
+      <bind calculate="concat('uuid:', uuid())" nodeset="/issue-3281/meta/instanceID" readonly="true()" type="string"/>
+    </model>
+  </h:head>
+  <h:body>
+    <input ref="/issue-3281/input">
+      <label>Input</label>
+    </input>
+    <select1 ref="/issue-3281/translator">
+      <label>Translator</label>
+      <item>
+        <label>[<output value=" /issue-3281/input "/>] District</label>
+        <value>district_hospital</value>
+      </item>
+      <item>
+        <label>[<output value=" /issue-3281/input "/>] Health Center</label>
+        <value>health_center</value>
+      </item>
+      <item>
+        <label>[<output value=" /issue-3281/input "/>] Area</label>
+        <value>clinic</value>
+      </item>
+    </select1>
+    <input ref="/issue-3281/debug">
+      <label>jr:choice-name($ {translator},'$ {translator}') = **<output value=" /issue-3281/output "/>**</label>
+    </input>
+    <input ref="/issue-3281/note">
+      <label>The value above is stale if _Input_ is changed and you leave the textbox since it modifies the choice label for _Translator_ but not the value. The choice-name function gets updated if the choice value is modified, but should also update if the choice label changes.</label>
+    </input>
+  </h:body>
+</h:html>
diff --git a/package-lock.json b/package-lock.json
index fce931981b5..0fe6a0b9779 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,22 +4,6 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "@medic/enketo-core": {
-      "version": "4.27.3",
-      "resolved": "https://registry.npmjs.org/@medic/enketo-core/-/enketo-core-4.27.3.tgz",
-      "integrity": "sha512-2Qe7J0qQYxFGUlP/S1TsBEqN3qhdNEouzZYFrkdd3RXx03eijKkFAMOag9I6H3coZPSLr91FGznayStxVlwMVw==",
-      "requires": {
-        "bootstrap-datepicker": "1.6.4",
-        "bootstrap-slider-basic": "3.3.0",
-        "bootstrap-timepicker": "0.5.2",
-        "enketo-xpathjs": "1.4.0",
-        "jquery": "3.2.1",
-        "jquery-touchswipe": "1.6.15",
-        "leaflet": "0.7.7",
-        "lie": "3.1.0",
-        "mergexml": "1.1.2"
-      }
-    },
     "@types/node": {
       "version": "6.0.85",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.85.tgz",
@@ -647,14 +631,6 @@
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz",
       "integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E="
     },
-    "bootstrap-datepicker": {
-      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/bootstrap-datepicker/-/bootstrap-datepicker-1.6.4.tgz",
-      "integrity": "sha1-iJ6+ztjqov8V7B8nPksHUxzEPaA=",
-      "requires": {
-        "jquery": "3.2.1"
-      }
-    },
     "bootstrap-daterangepicker": {
       "version": "2.1.25",
       "resolved": "https://registry.npmjs.org/bootstrap-daterangepicker/-/bootstrap-daterangepicker-2.1.25.tgz",
@@ -672,11 +648,6 @@
         "jquery": "3.2.1"
       }
     },
-    "bootstrap-timepicker": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/bootstrap-timepicker/-/bootstrap-timepicker-0.5.2.tgz",
-      "integrity": "sha1-EO2fKi8LjMrvzeD89qBzi5GaODU="
-    },
     "bootstrap-tour": {
       "version": "0.10.3",
       "resolved": "https://registry.npmjs.org/bootstrap-tour/-/bootstrap-tour-0.10.3.tgz",
@@ -945,6 +916,108 @@
       "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
       "dev": true
     },
+    "bundlesize": {
+      "version": "0.13.2",
+      "resolved": "https://registry.npmjs.org/bundlesize/-/bundlesize-0.13.2.tgz",
+      "integrity": "sha512-QU+kIetJDpHhwP07RsMRttB1QW073PoBr4XmJkp2CsFdV6jOtimQXkygonC1q4urwho3akXhK8LyQaVrFI0rcg==",
+      "dev": true,
+      "requires": {
+        "axios": "0.16.2",
+        "bytes": "2.5.0",
+        "ci-env": "1.4.0",
+        "commander": "2.11.0",
+        "github-build": "1.2.0",
+        "glob": "7.1.2",
+        "gzip-size": "3.0.0",
+        "prettycli": "1.4.2",
+        "read-pkg-up": "2.0.0"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz",
+          "integrity": "sha1-TJQj6i0lLCcMQbK97+/5u2tiwGo=",
+          "dev": true
+        },
+        "commander": {
+          "version": "2.11.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+          "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "2.0.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "load-json-file": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "parse-json": "2.2.0",
+            "pify": "2.3.0",
+            "strip-bom": "3.0.0"
+          }
+        },
+        "path-type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "dev": true,
+          "requires": {
+            "pify": "2.3.0"
+          }
+        },
+        "read-pkg": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "2.0.0",
+            "normalize-package-data": "2.3.8",
+            "path-type": "2.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+          "dev": true,
+          "requires": {
+            "find-up": "2.1.0",
+            "read-pkg": "2.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        }
+      }
+    },
     "cached-path-relative": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz",
@@ -2107,10 +2180,36 @@
         "wtf-8": "1.0.0"
       }
     },
-    "enketo-xpathjs": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/enketo-xpathjs/-/enketo-xpathjs-1.4.0.tgz",
-      "integrity": "sha1-fNUBRG+3UNRzvFrB2oPiffJeoR4="
+    "enketo-core": {
+      "version": "4.38.2",
+      "resolved": "https://registry.npmjs.org/enketo-core/-/enketo-core-4.38.2.tgz",
+      "integrity": "sha1-x+q6hZMpge/4yMexxIh/2totRcw=",
+      "requires": {
+        "bootstrap-datepicker": "1.7.1",
+        "bootstrap-slider-basic": "3.3.0",
+        "enketo-xpathjs": "1.6.0",
+        "jquery": "3.2.1",
+        "jquery-touchswipe": "1.6.15",
+        "leaflet": "0.7.7",
+        "lie": "3.1.0",
+        "mergexml": "1.1.2",
+        "signature_pad": "2.2.1"
+      },
+      "dependencies": {
+        "bootstrap-datepicker": {
+          "version": "1.7.1",
+          "resolved": "https://registry.npmjs.org/bootstrap-datepicker/-/bootstrap-datepicker-1.7.1.tgz",
+          "integrity": "sha1-Tuf680iI2+x4NPv52+fEJ34B3a8=",
+          "requires": {
+            "jquery": "3.2.1"
+          }
+        },
+        "enketo-xpathjs": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/enketo-xpathjs/-/enketo-xpathjs-1.6.0.tgz",
+          "integrity": "sha1-pJV9RCY3j0iyeFjFqYuXSYnihGg="
+        }
+      }
     },
     "ent": {
       "version": "2.2.0",
@@ -2373,123 +2472,1107 @@
           "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "dev": true,
+      "requires": {
+        "path-exists": "2.1.0",
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "findup-sync": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
+      "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
+      "dev": true,
+      "requires": {
+        "glob": "5.0.15"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "5.0.15",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+          "dev": true,
+          "requires": {
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        }
+      }
+    },
+    "follow-redirects": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.4.tgz",
+      "integrity": "sha512-Suw6KewLV2hReSyEOeql+UUkBVyiBm3ok1VPrVFRZnQInWpdoZbbiG5i8aJVSjTr0yQ4Ava0Sh6/joCg1Brdqw==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.8"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.8",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+          "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        }
+      }
+    },
+    "font-awesome": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
+      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "for-own": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+      "dev": true,
+      "requires": {
+        "for-in": "1.0.2"
+      }
+    },
+    "foreground-child": {
+      "version": "1.5.6",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz",
+      "integrity": "sha1-T9ca0t/elnibmApcCilZN8svXOk=",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "4.0.2",
+        "signal-exit": "3.0.2"
+      }
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    },
+    "form-data": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
+      "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.15"
+      }
+    },
+    "formatio": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz",
+      "integrity": "sha1-87IWfZBoxGmKjVH092CjmlTYGOs=",
+      "dev": true,
+      "requires": {
+        "samsam": "1.2.1"
+      }
+    },
+    "fs-access": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
+      "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
+      "dev": true,
+      "requires": {
+        "null-check": "1.0.0"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "fsevents": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",
+      "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "2.6.2",
+        "node-pre-gyp": "0.6.36"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ajv": {
+          "version": "4.11.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "aproba": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "1.0.0",
+            "readable-stream": "2.2.9"
+          }
+        },
+        "asn1": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws4": {
+          "version": "1.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "balanced-match": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "tweetnacl": "0.14.5"
+          }
+        },
+        "block-stream": {
+          "version": "0.0.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3"
+          }
+        },
+        "boom": {
+          "version": "2.10.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "brace-expansion": {
+          "version": "1.1.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "balanced-match": "0.4.2",
+            "concat-map": "0.0.1"
+          }
+        },
+        "buffer-shims": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "co": {
+          "version": "4.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "combined-stream": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "delayed-stream": "1.0.0"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "boom": "2.10.1"
+          }
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "debug": {
+          "version": "2.6.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ecc-jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "extend": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "extsprintf": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.15"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "fstream": {
+          "version": "1.0.11",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "inherits": "2.0.3",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.1"
+          }
+        },
+        "fstream-ignore": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fstream": "1.0.11",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4"
+          }
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "1.1.1",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
+          }
+        },
+        "getpass": {
+          "version": "0.1.7",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.11",
+          "bundled": true,
+          "dev": true
+        },
+        "har-schema": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "bundled": true,
+          "dev": true
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.0",
+            "sshpk": "1.13.0"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "ini": {
+          "version": "1.3.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jodid25519": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-stable-stringify": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsonify": "0.0.0"
+          }
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsonify": {
+          "version": "0.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsprim": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.0.2",
+            "json-schema": "0.2.3",
+            "verror": "1.3.6"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "mime-db": {
+          "version": "1.27.0",
+          "bundled": true,
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.15",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "mime-db": "1.27.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "node-pre-gyp": {
+          "version": "0.6.36",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "mkdirp": "0.5.1",
+            "nopt": "4.0.1",
+            "npmlog": "4.1.0",
+            "rc": "1.2.1",
+            "request": "2.81.0",
+            "rimraf": "2.6.1",
+            "semver": "5.3.0",
+            "tar": "2.2.1",
+            "tar-pack": "3.4.0"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.0",
+            "osenv": "0.1.4"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "performance-now": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "bundled": true,
+          "dev": true
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "qs": {
+          "version": "6.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "0.4.2",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.2.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "buffer-shims": "1.0.0",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "1.0.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "request": {
+          "version": "2.81.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.1.4",
+            "har-validator": "4.2.1",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.15",
+            "oauth-sign": "0.8.2",
+            "performance-now": "0.2.0",
+            "qs": "6.4.0",
+            "safe-buffer": "5.0.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.2",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "glob": "7.1.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "semver": {
+          "version": "5.3.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "sshpk": {
+          "version": "1.13.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asn1": "0.2.3",
+            "assert-plus": "1.0.0",
+            "bcrypt-pbkdf": "1.0.1",
+            "dashdash": "1.14.1",
+            "ecc-jsbn": "0.1.1",
+            "getpass": "0.1.7",
+            "jodid25519": "1.0.2",
+            "jsbn": "0.1.1",
+            "tweetnacl": "0.14.5"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
           }
         },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "dev": true,
-      "requires": {
-        "path-exists": "2.1.0",
-        "pinkie-promise": "2.0.1"
-      }
-    },
-    "findup-sync": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz",
-      "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=",
-      "dev": true,
-      "requires": {
-        "glob": "5.0.15"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "5.0.15",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
           "dev": true,
           "requires": {
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "2.2.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "block-stream": "0.0.9",
+            "fstream": "1.0.11",
+            "inherits": "2.0.3"
+          }
+        },
+        "tar-pack": {
+          "version": "3.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "2.6.8",
+            "fstream": "1.0.11",
+            "fstream-ignore": "1.0.5",
             "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "readable-stream": "2.2.9",
+            "rimraf": "2.6.1",
+            "tar": "2.2.1",
+            "uid-number": "0.0.6"
+          }
+        },
+        "tough-cookie": {
+          "version": "2.3.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "verror": {
+          "version": "1.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "extsprintf": "1.0.2"
+          }
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "1.0.2"
           }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
         }
       }
     },
-    "font-awesome": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
-      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
-    },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true
-    },
-    "for-own": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
-      "dev": true,
-      "requires": {
-        "for-in": "1.0.2"
-      }
-    },
-    "foreground-child": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz",
-      "integrity": "sha1-T9ca0t/elnibmApcCilZN8svXOk=",
+    "fstream": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
       "dev": true,
       "requires": {
-        "cross-spawn": "4.0.2",
-        "signal-exit": "3.0.2"
+        "graceful-fs": "4.1.11",
+        "inherits": "2.0.3",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.2.8"
       }
     },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    "function-bind": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
+      "integrity": "sha1-FhdnFMgBeY5Ojyz391KUZ7tKV3E=",
+      "dev": true
     },
-    "form-data": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-      "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
+    "function-extended": {
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/function-extended/-/function-extended-0.0.9.tgz",
+      "integrity": "sha1-8os/B2I1R1PUrW7bgK6O2+4zQ2E=",
       "requires": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.5",
-        "mime-types": "2.1.15"
+        "arguments-extended": "0.0.3",
+        "extended": "0.0.6",
+        "is-extended": "0.0.10"
       }
     },
-    "formatio": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.2.0.tgz",
-      "integrity": "sha1-87IWfZBoxGmKjVH092CjmlTYGOs=",
+    "gauge": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "dev": true,
       "requires": {
-        "samsam": "1.2.1"
+        "aproba": "1.1.2",
+        "console-control-strings": "1.1.0",
+        "has-unicode": "2.0.1",
+        "object-assign": "4.1.1",
+        "signal-exit": "3.0.2",
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wide-align": "1.1.2"
       }
     },
-    "fs-access": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
-      "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
+    "gaze": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz",
+      "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=",
       "dev": true,
       "requires": {
-        "null-check": "1.0.0"
+        "globule": "1.1.0"
       }
     },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    "generate-function": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
+      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
+      "dev": true
     },
-    "fsevents": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.1.tgz",
-      "integrity": "sha1-8Z/Sj0Pur3YWgOUZogPE0LPTGv8=",
+    "generate-object-property": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
       "dev": true,
       "optional": true,
       "requires": {
@@ -5686,9 +6769,9 @@
       "dev": true
     },
     "medic-enketo-xslt": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/medic-enketo-xslt/-/medic-enketo-xslt-1.3.0.tgz",
-      "integrity": "sha1-60A2Ty6XT1M/qAWCbYzF++kxKZk="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/medic-enketo-xslt/-/medic-enketo-xslt-1.4.1.tgz",
+      "integrity": "sha512-KDnDayfeuHgE8NdM/j3aUeNjB+fBR6T7kH9XpsQHCLHMDiRdMpRjwzSa6v3Bdf76NKPxnPNJ2lGLZP6NaN5w/g=="
     },
     "medic-nootils": {
       "version": "1.0.3",
@@ -9020,6 +10103,11 @@
       "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
       "dev": true
     },
+    "signature_pad": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/signature_pad/-/signature_pad-2.2.1.tgz",
+      "integrity": "sha512-GKWN1Qkxd8qd35r2lKAEefKy+GnVbZr08gZmNCCmWr29Ug+l9AVuAqAzDaVTVhNRIGmWYJZ7Dh9/LnOklSVMSg=="
+    },
     "simple-fmt": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz",
diff --git a/package.json b/package.json
index cf12ba0cd67..24f6234c2fa 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,6 @@
     "url": "git://github.com/medic/medic-webapp.git"
   },
   "dependencies": {
-    "@medic/enketo-core": "4.27.3",
     "angular": "^1.6.4",
     "angular-cookie": "^4.1.0",
     "angular-nvd3": "^1.0.9",
@@ -24,11 +23,12 @@
     "bootstrap": "^3.3.7",
     "bootstrap-daterangepicker": "^2.1.24",
     "bootstrap-tour": "^0.10.3",
+    "enketo-core": "^4.38.2",
     "font-awesome": "^4.7.0",
     "google-libphonenumber": "^2.0.19",
     "jquery": "^3.2.1",
     "json2xml": "^0.1.3",
-    "medic-enketo-xslt": "^1.1.1",
+    "medic-enketo-xslt": "^1.4.1",
     "medic-nootils": "^1.0.3",
     "messageformat": "^1.0.0",
     "moment": "^2.17.1",
diff --git a/patches/3804_jr-choice-name.patch b/patches/3804_jr-choice-name.patch
new file mode 100644
index 00000000000..c9e8e15901a
--- /dev/null
+++ b/patches/3804_jr-choice-name.patch
@@ -0,0 +1,20 @@
+*** node_modules/enketo-core/src/js/output.js	2017-04-20 00:28:05.000000000 +0200
+--- static/js/enketo/core/output.js	2017-08-23 15:35:19.000000000 +0200
+***************
+*** 64,69 ****
+--- 64,78 ----
+              }
+              if ( $output.text() !== val ) {
+                  $output.text( val );
++ 
++ // MEDIC CHANGES : BEGIN
++                 // For <output>s that are children of choice-groups, trigger
++                 // dependent calculations in case one is using a jr:choice-name.
++                 var owName = $output.closest( '.option-wrapper' ).find( 'input' ).attr( 'name' );
++                 if ( owName ) {
++                     that.form.calc.update( owName );
++                 }
++ // MEDIC CHANGES : END
+              }
+          } );
+      }
diff --git a/patches/enketo-datepicker-extended-sass-import.patch b/patches/enketo-datepicker-extended-sass-import.patch
new file mode 100644
index 00000000000..f3b32a09cdd
--- /dev/null
+++ b/patches/enketo-datepicker-extended-sass-import.patch
@@ -0,0 +1,13 @@
+*** original	2017-08-29 12:51:04.000000000 +0200
+--- patched	2017-08-29 12:50:57.000000000 +0200
+***************
+*** 1,4 ****
+! @import "../../../../../node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker";
+  
+  /** fixes by martijn **/
+  
+--- 1,4 ----
+! @import "../../../node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker";
+  
+  /** fixes by martijn **/
+  
diff --git a/static/css/enketo/_widgets.scss b/static/css/enketo/_widgets.scss
index a5b20763082..80858af2a3a 100644
--- a/static/css/enketo/_widgets.scss
+++ b/static/css/enketo/_widgets.scss
@@ -1,8 +1,8 @@
-@import "../../../node_modules/@medic/enketo-core/src/widget/note/notewidget.scss";
-@import "../../../node_modules/@medic/enketo-core/src/widget/geo/geopicker.scss";
-@import "../../../node_modules/@medic/enketo-core/src/widget/table/tablewidget.scss";
-@import "../../../node_modules/@medic/enketo-core/src/widget/radio/radiopicker.scss";
-@import "../../../node_modules/@medic/enketo-core/src/widget/date/datepicker-extended.scss";
-@import "../../../node_modules/@medic/enketo-core/src/widget/time/timepicker-extended.scss";
-@import "../../../node_modules/@medic/enketo-core/src/widget/datetime/datetimepicker-extended.scss";
-@import "../../../node_modules/@medic/enketo-core/src/widget/horizontal-choices/horizontalchoices.scss";
+@import "../../../node_modules/enketo-core/src/widget/note/notewidget.scss";
+@import "../../../node_modules/enketo-core/src/widget/geo/geopicker.scss";
+@import "../../../node_modules/enketo-core/src/widget/table/tablewidget.scss";
+@import "../../../node_modules/enketo-core/src/widget/radio/radiopicker.scss";
+@import "../../../node_modules/enketo-core/src/widget/date/datepicker-extended.scss";
+@import "../../../node_modules/enketo-core/src/widget/time/timepicker-extended.scss";
+@import "../../../node_modules/enketo-core/src/widget/datetime/datetimepicker-extended.scss";
+@import "../../../node_modules/enketo-core/src/widget/horizontal-choices/horizontalchoices.scss";
diff --git a/static/css/enketo/enketo.scss b/static/css/enketo/enketo.scss
index 85700974746..925ccd5d240 100644
--- a/static/css/enketo/enketo.scss
+++ b/static/css/enketo/enketo.scss
@@ -1,17 +1,17 @@
 @import "fonts";
 @import "variables";
-@import "../../../node_modules/@medic/enketo-core/src/sass/core/variables";
-@import "../../../node_modules/@medic/enketo-core/src/sass/core/mixins";
-@import "../../../node_modules/@medic/enketo-core/src/sass/formhub/mixins";
+@import "../../../node_modules/enketo-core/src/sass/core/variables";
+@import "../../../node_modules/enketo-core/src/sass/core/mixins";
+@import "../../../node_modules/enketo-core/src/sass/formhub/mixins";
 
-@import "../../../node_modules/@medic/enketo-core/src/sass/core/reset";
-@import "../../../node_modules/@medic/enketo-core/src/sass/core/utilities";
-@import "../../../node_modules/@medic/enketo-core/src/sass/core/icons";
-@import "../../../node_modules/@medic/enketo-core/src/sass/core/layout";
-@import "../../../node_modules/@medic/enketo-core/src/sass/core/buttons";
-@import "../../../node_modules/@medic/enketo-core/src/sass/core/main";
-@import "../../../node_modules/@medic/enketo-core/src/sass/core/pages";
+@import "../../../node_modules/enketo-core/src/sass/core/reset";
+@import "../../../node_modules/enketo-core/src/sass/core/utilities";
+@import "../../../node_modules/enketo-core/src/sass/core/icons";
+@import "../../../node_modules/enketo-core/src/sass/core/layout";
+@import "../../../node_modules/enketo-core/src/sass/core/buttons";
+@import "../../../node_modules/enketo-core/src/sass/core/main";
+@import "../../../node_modules/enketo-core/src/sass/core/pages";
 @import "widgets";
-@import "../../../node_modules/@medic/enketo-core/src/sass/core/slider";
-@import "../../../node_modules/@medic/enketo-core/src/sass/core/responsive";
-@import "../../../node_modules/@medic/enketo-core/src/sass/formhub/main";
+@import "../../../node_modules/enketo-core/src/sass/core/slider";
+@import "../../../node_modules/enketo-core/src/sass/core/responsive";
+@import "../../../node_modules/enketo-core/src/sass/formhub/main";
diff --git a/static/js/enketo/main.js b/static/js/enketo/main.js
index 6433adde464..6c24fafb55d 100644
--- a/static/js/enketo/main.js
+++ b/static/js/enketo/main.js
@@ -1,3 +1,3 @@
-window.EnketoForm = require('@medic/enketo-core/src/js/Form');
+window.EnketoForm = require('enketo-core/src/js/Form');
 $.fn.datepicker.defaults.container = '.content-pane .enketo';
 $.fn.datepicker.defaults.orientation = 'bottom';
diff --git a/static/js/enketo/widgets.js b/static/js/enketo/widgets.js
index cc8fd17ac9c..ee2360ccc0b 100644
--- a/static/js/enketo/widgets.js
+++ b/static/js/enketo/widgets.js
@@ -6,13 +6,13 @@ if ( typeof exports === 'object' && typeof exports.nodeName !== 'string' && type
 
 define( function( require, exports, module ) {
     var widgets = [
-        require( '@medic/enketo-core/src/widget/geo/geopicker' ),
-        require( '@medic/enketo-core/src/widget/table/tablewidget' ),
-        require( '@medic/enketo-core/src/widget/radio/radiopicker' ),
-        require( '@medic/enketo-core/src/widget/date/datepicker-extended' ),
-        require( '@medic/enketo-core/src/widget/time/timepicker-extended' ),
-        require( '@medic/enketo-core/src/widget/datetime/datetimepicker-extended' ),
-        require( '@medic/enketo-core/src/widget/horizontal-choices/horizontalchoices' ),
+        require( 'enketo-core/src/widget/geo/geopicker' ),
+        require( 'enketo-core/src/widget/table/tablewidget' ),
+        require( 'enketo-core/src/widget/radio/radiopicker' ),
+        require( 'enketo-core/src/widget/date/datepicker-extended' ),
+        require( 'enketo-core/src/widget/time/timepicker-extended' ),
+        require( 'enketo-core/src/widget/datetime/datetimepicker-extended' ),
+        require( 'enketo-core/src/widget/horizontal-choices/horizontalchoices' ),
         require( './widgets/notewidget' ),
         require( './widgets/countdown-widget' ),
         require( './widgets/db-object-widget' ),
diff --git a/static/js/enketo/widgets/android-datepicker.js b/static/js/enketo/widgets/android-datepicker.js
index 0468391e2b6..09115535447 100644
--- a/static/js/enketo/widgets/android-datepicker.js
+++ b/static/js/enketo/widgets/android-datepicker.js
@@ -21,9 +21,9 @@ if ( typeof exports === 'object' && typeof exports.nodeName !== 'string' && type
 
 define( function( require, exports, module ) {
     'use strict';
-    var Widget = require( '@medic/enketo-core/src/js/Widget' );
+    var Widget = require( 'enketo-core/src/js/Widget' );
     var $ = require( 'jquery' );
-    require( '@medic/enketo-core/src/js/plugins' );
+    require( 'enketo-core/src/js/plugins' );
 
     var pluginName = 'androiddatepicker';
 
diff --git a/static/js/enketo/widgets/bikram-sambat-datepicker.js b/static/js/enketo/widgets/bikram-sambat-datepicker.js
index e73b992aff5..ba59e80f927 100644
--- a/static/js/enketo/widgets/bikram-sambat-datepicker.js
+++ b/static/js/enketo/widgets/bikram-sambat-datepicker.js
@@ -6,9 +6,9 @@ if ( typeof exports === 'object' && typeof exports.nodeName !== 'string' && type
 
 define( function( require, exports, module ) {
     'use strict';
-    var Widget = require( '@medic/enketo-core/src/js/Widget' );
+    var Widget = require( 'enketo-core/src/js/Widget' );
     var $ = require( 'jquery' );
-    require( '@medic/enketo-core/src/js/plugins' );
+    require( 'enketo-core/src/js/plugins' );
     var bikram_sambat_bs = require( 'bikram-sambat-bootstrap' );
 
     var pluginName = 'bikramsambatdatepicker';
diff --git a/static/js/enketo/widgets/countdown-widget.js b/static/js/enketo/widgets/countdown-widget.js
index 3afa4ab242c..f245e29e4a3 100644
--- a/static/js/enketo/widgets/countdown-widget.js
+++ b/static/js/enketo/widgets/countdown-widget.js
@@ -21,9 +21,9 @@ if ( typeof exports === 'object' && typeof exports.nodeName !== 'string' && type
 
 define( function( require, exports, module ) {
     'use strict';
-    var Widget = require( '@medic/enketo-core/src/js/Widget' );
+    var Widget = require( 'enketo-core/src/js/Widget' );
     var $ = require( 'jquery' );
-    require( '@medic/enketo-core/src/js/plugins' );
+    require( 'enketo-core/src/js/plugins' );
 
     var pluginName = 'timerwidget';
 
diff --git a/static/js/enketo/widgets/db-object-widget.js b/static/js/enketo/widgets/db-object-widget.js
index 2bf8fe089df..562e63daf68 100644
--- a/static/js/enketo/widgets/db-object-widget.js
+++ b/static/js/enketo/widgets/db-object-widget.js
@@ -7,10 +7,10 @@ if ( typeof exports === 'object' && typeof exports.nodeName !== 'string' && type
 define( function( require, exports, module ) {
     'use strict';
     var _ = require('underscore');
-    var Widget = require('@medic/enketo-core/src/js/Widget');
+    var Widget = require('enketo-core/src/js/Widget');
     var $ = require('jquery');
 
-    require('@medic/enketo-core/src/js/plugins');
+    require('enketo-core/src/js/plugins');
 
     var pluginName = 'dbobjectwidget';
 
diff --git a/static/js/enketo/widgets/notewidget.js b/static/js/enketo/widgets/notewidget.js
index 61bf033990a..ed5bd779e58 100644
--- a/static/js/enketo/widgets/notewidget.js
+++ b/static/js/enketo/widgets/notewidget.js
@@ -21,9 +21,9 @@ if ( typeof exports === 'object' && typeof exports.nodeName !== 'string' && type
 
 define( function( require, exports, module ) {
     'use strict';
-    var Widget = require( '@medic/enketo-core/src/js/Widget' );
+    var Widget = require( 'enketo-core/src/js/Widget' );
     var $ = require( 'jquery' );
-    require( '@medic/enketo-core/src/js/plugins' );
+    require( 'enketo-core/src/js/plugins' );
 
     var pluginName = 'notewidget';
 
diff --git a/static/js/enketo/widgets/phone-widget.js b/static/js/enketo/widgets/phone-widget.js
index 019d5c6d652..93ca8e9ccfb 100644
--- a/static/js/enketo/widgets/phone-widget.js
+++ b/static/js/enketo/widgets/phone-widget.js
@@ -6,11 +6,11 @@ if ( typeof exports === 'object' && typeof exports.nodeName !== 'string' && type
 
 define( function( require, exports, module ) {
     'use strict';
-    var FormModel = require( '@medic/enketo-core/src/js/Form-model' );
-    var Widget = require( '@medic/enketo-core/src/js/Widget' );
+    var FormModel = require( 'enketo-core/src/js/Form-model' );
+    var Widget = require( 'enketo-core/src/js/Widget' );
     var $ = require( 'jquery' );
     var libphonenumber = require( 'libphonenumber/utils' );
-    require( '@medic/enketo-core/src/js/plugins' );
+    require( 'enketo-core/src/js/plugins' );
 
     var pluginName = 'phonewidget';
 
diff --git a/static/js/enketo/widgets/unselectable-radios.js b/static/js/enketo/widgets/unselectable-radios.js
index b9184801fa4..83308bc2aa6 100644
--- a/static/js/enketo/widgets/unselectable-radios.js
+++ b/static/js/enketo/widgets/unselectable-radios.js
@@ -21,9 +21,9 @@ if ( typeof exports === 'object' && typeof exports.nodeName !== 'string' && type
 
 define( function( require, exports, module ) {
     'use strict';
-    var Widget = require( '@medic/enketo-core/src/js/Widget' );
+    var Widget = require( 'enketo-core/src/js/Widget' );
     var $ = require( 'jquery' );
-    require( '@medic/enketo-core/src/js/plugins' );
+    require( 'enketo-core/src/js/plugins' );
 
     var pluginName = 'unselectableradios';
 
diff --git a/static/js/enketo/widgets/z-score.js b/static/js/enketo/widgets/z-score.js
index ea4003ba29f..d0fb2b252bb 100644
--- a/static/js/enketo/widgets/z-score.js
+++ b/static/js/enketo/widgets/z-score.js
@@ -7,10 +7,10 @@ if ( typeof exports === 'object' && typeof exports.nodeName !== 'string' && type
 define( function( require, exports, module ) {
     'use strict';
 
-    var Widget = require('@medic/enketo-core/src/js/Widget');
+    var Widget = require('enketo-core/src/js/Widget');
     var $ = require('jquery');
 
-    require('@medic/enketo-core/src/js/plugins');
+    require('enketo-core/src/js/plugins');
 
     var pluginName = 'zscorewidget';
 
diff --git a/static/js/services/enketo.js b/static/js/services/enketo.js
index cd2230c5ba0..368e5c088af 100644
--- a/static/js/services/enketo.js
+++ b/static/js/services/enketo.js
@@ -267,7 +267,7 @@ angular.module('inboxServices').service('Enketo',
       $wrapper.find('.btn.next-page')
         .off('.pagemode')
         .on('click.pagemode', function() {
-          form.getView().pages.next()
+          form.pages.next()
             .then(function(newPageIndex) {
               if(typeof newPageIndex === 'number') {
                 window.history.pushState({ enketo_page_number: newPageIndex }, '');
@@ -292,7 +292,7 @@ angular.module('inboxServices').service('Enketo',
           var targetPage = event.originalEvent.state.enketo_page_number;
 
           if ($wrapper.find('.container').not(':empty')) {
-            var pages = form.getView().pages;
+            var pages = form.pages;
             pages.flipTo(pages.getAllActive()[targetPage], targetPage);
           }
         }