diff --git a/Gruntfile.js b/Gruntfile.js
index ada4eed96..81487fe1b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,16 +1,6 @@
 module.exports = function(grunt) {
 
-  //Load NPM tasks
-  grunt.loadNpmTasks('grunt-contrib-watch');
-  grunt.loadNpmTasks('grunt-mocha-test');
-  grunt.loadNpmTasks('grunt-markdown');
-  grunt.loadNpmTasks('grunt-shell');
-  grunt.loadNpmTasks('grunt-contrib-cssmin');
-  grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-angular-gettext');
-  grunt.loadNpmTasks('grunt-jsdoc');
-  grunt.loadNpmTasks('grunt-release');
+  require('load-grunt-tasks')(grunt);
 
   // Project Configuration
   grunt.initConfig({
diff --git a/package.json b/package.json
index 65773c273..9e7f0edaf 100644
--- a/package.json
+++ b/package.json
@@ -1,91 +1,95 @@
 {
-  "license": "MIT",
   "name": "copay",
+  "description": "A multisignature wallet",
+  "author": "BitPay",
+  "version": "0.6.1",
+  "keywords": ["wallet", "copay", "multisignature", "bitcoin"],
+  "main": "app.js",
+  "id": "jid1-x7bV5evAaI1P9Q",
+
+  "homepage": "https://github.com/bitpay/copay",
+  "license": "MIT",
+
   "repository": {
     "url": "git://github.com/bitpay/copay.git",
     "type": "git"
   },
-  "author": "",
+
   "bugs": {
     "url": "https://github.com/bitpay/copay/issues"
   },
-  "version": "0.6.1",
+
   "dependencies": {
     "browser-request": "^0.3.2",
     "inherits": "^2.0.1",
-    "mocha": "^1.18.2",
-    "mocha-lcov-reporter": "0.0.1",
     "optimist": "^0.6.1",
     "preconditions": "^1.0.7",
     "request": "^2.40.0",
-    "sinon": "1.9.1",
     "underscore": "^1.7.0"
   },
+
   "scripts": {
+    "start": "node server.js",
+
+    "coverage": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- --reporter spec test",
+    "test": "sh test/run.sh",
+    "dist": "node shell/scripts/dist.js",
+
     "shell": "node shell/scripts/launch.js",
     "firefox": "source browser-extensions/firefox/build.sh",
     "chrome": "source browser-extensions/chrome/build.sh",
     "setup-shell": "node shell/scripts/download-atom-shell.js",
-    "start": "node server.js",
-    "coverage": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- --reporter spec test",
-    "test": "sh test/run.sh",
-    "dist": "node shell/scripts/dist.js",
-    "sign": "gpg -u 1112CFA1 --output browser-extensions/firefox/copay.xpi.sig --detach-sig browser-extensions/firefox/copay.xpi; gpg -u 1112CFA1 --output browser-extensions/chrome/copay-chrome-extension.zip.sig --detach-sig browser-extensions/chrome/copay-chrome-extension.zip",
-    "verify": "gpg --verify browser-extensions/firefox/copay.xpi.sig browser-extensions/firefox/copay.xpi; gpg --verify browser-extensions/chrome/copay-chrome-extension.zip.sig browser-extensions/chrome/copay-chrome-extension.zip",
-    "postinstall": "./node_modules/.bin/grunt"
+    "postinstall": "./node_modules/.bin/grunt",
+
+     "sign": "gpg -u 1112CFA1 --output browser-extensions/firefox/copay.xpi.sig --detach-sig browser-extensions/firefox/copay.xpi; gpg -u 1112CFA1 --output browser-extensions/chrome/copay-chrome-extension.zip.sig --detach-sig browser-extensions/chrome/copay-chrome-extension.zip",
+     "verify": "gpg --verify browser-extensions/firefox/copay.xpi.sig browser-extensions/firefox/copay.xpi; gpg --verify browser-extensions/chrome/copay-chrome-extension.zip.sig browser-extensions/chrome/copay-chrome-extension.zip"
   },
-  "keywords": [
-    "wallet",
-    "copay",
-    "multisignature",
-    "bitcoin"
-  ],
+
   "devDependencies": {
-    "async": "0.9.0",
-    "bitcore": "0.1.36",
-    "blanket": "1.1.6",
-    "browser-pack": "2.0.1",
-    "browser-request": "0.3.2",
-    "browserify": "3.32.1",
-    "buffertools": "2.0.1",
-    "chai": "1.9.1",
-    "cli-color": "0.3.2",
-    "commander": "2.1.0",
-    "coveralls": "2.10.0",
-    "crypto-js": "3.1.2",
-    "express": "4.0.0",
-    "github-releases": "0.2.0",
+    "async": "^0.9.0",
+    "bitcore": "^0.1.36",
+    "blanket": "^1.1.6",
+    "browser-pack": "^2.0.1",
+    "browser-request": "^0.3.2",
+    "browserify": "^3.32.1",
+    "buffertools": "^2.0.1",
+    "chai": "^1.9.1",
+    "cli-color": "^0.3.2",
+    "commander": "^2.1.0",
+    "coveralls": "^2.10.0",
+    "crypto-js": "^3.1.2",
+    "express": "^4.0.0",
+    "github-releases": "^0.2.0",
     "grunt": "^0.4.5",
     "grunt-angular-gettext": "^0.2.15",
-    "grunt-browserify": "2.0.8",
+    "grunt-browserify": "^2.0.8",
     "grunt-cli": "^0.1.13",
-    "grunt-contrib-concat": "0.5.0",
-    "grunt-contrib-cssmin": "0.10.0",
+    "grunt-contrib-concat": "^0.5.0",
+    "grunt-contrib-cssmin": "^0.10.0",
     "grunt-contrib-uglify": "^0.5.1",
-    "grunt-contrib-watch": "0.5.3",
+    "grunt-contrib-watch": "^0.5.3",
     "grunt-jsdoc": "^0.5.7",
-    "grunt-markdown": "0.5.0",
-    "grunt-mocha-test": "0.8.2",
+    "grunt-markdown": "^0.5.0",
+    "grunt-mocha-test": "^0.8.2",
     "grunt-release": "^0.7.0",
-    "grunt-shell": "0.6.4",
-    "istanbul": "0.2.10",
-    "karma": "0.12.9",
-    "karma-chrome-launcher": "0.1.3",
-    "karma-firefox-launcher": "~0.1",
-    "karma-mocha": "0.1.3",
+    "grunt-shell": "^0.6.4",
+    "istanbul": "^0.2.10",
+    "karma": "^0.12.9",
+    "karma-chrome-launcher": "^0.1.3",
+    "karma-firefox-launcher": "^0.1",
+    "karma-mocha": "^0.1.3",
     "karma-phantomjs-launcher": "^0.1.4",
-    "mocha": "1.18.2",
-    "mocha-lcov-reporter": "0.0.1",
+    "load-grunt-tasks": "^0.6.0",
+    "mocha": "^1.18.2",
+    "mocha-lcov-reporter": "^0.0.1",
     "mock-fs": "^2.3.1",
-    "node-cryptojs-aes": "0.4.0",
-    "request": "2.40.0",
-    "shelljs": "0.3.0",
-    "socket.io-client": "1.0.6",
-    "travis-cov": "0.2.5",
-    "uglifyify": "1.2.3"
-  },
-  "main": "app.js",
-  "homepage": "https://github.com/bitpay/copay",
-  "id": "jid1-x7bV5evAaI1P9Q",
-  "description": "A multisignature wallet"
+    "node-cryptojs-aes": "^0.4.0",
+    "request": "^2.40.0",
+    "shelljs": "^0.3.0",
+    "sinon": "^1.9.1",
+    "socket.io-client": "^1.0.6",
+    "travis-cov": "^0.2.5",
+    "uglifyify": "^1.2.3"
+  }
+
 }
diff --git a/test/mocha.conf.js b/test/mocha.conf.js
index f1c16fc25..4c3b4bbd5 100644
--- a/test/mocha.conf.js
+++ b/test/mocha.conf.js
@@ -1,5 +1,5 @@
 if (typeof window != 'undefined') {
   window.mocha.setup({
-    timeout: 5000
+    timeout: 8000
   });
 }