lazy-require.diff

diff --git a/lib/commands/build.js b/lib/commands/build.js
index 9c897a7..5d7ecec 100644
--- a/lib/commands/build.js
+++ b/lib/commands/build.js
@@ -1,11 +1,11 @@
-var Config = require("truffle-config");
-var Build = require("../build");
-
 var command = {
   command: 'build',
   description: 'Execute build pipeline (if configuration present)',
   builder: {},
   run: function (options, done) {
+    var Config = require("truffle-config");
+    var Build = require("../build");
+
     var config = Config.detect(options);
     Build.build(config, done);
   }
diff --git a/lib/commands/compile.js b/lib/commands/compile.js
index 42d396c..9ec3b39 100644
--- a/lib/commands/compile.js
+++ b/lib/commands/compile.js
@@ -1,6 +1,3 @@
-var Config = require("truffle-config");
-var Contracts = require("../contracts");
-
 var command = {
   command: 'compile',
   description: 'Compile contract source files',
@@ -11,6 +8,9 @@ var command = {
     }
   },
   run: function (options, done) {
+    var Config = require("truffle-config");
+    var Contracts = require("../contracts");
+
     var config = Config.detect(options);
     Contracts.compile(config, done);
   }
diff --git a/lib/commands/console.js b/lib/commands/console.js
index 23f153e..c89a599 100644
--- a/lib/commands/console.js
+++ b/lib/commands/console.js
@@ -1,12 +1,12 @@
-var Config = require("truffle-config");
-var Console = require("../repl");
-var Environment = require("../environment");
-
 var command = {
   command: 'console',
   description: 'Run a console with contract abstractions and commands available',
   builder: {},
   run: function (options, done) {
+    var Config = require("truffle-config");
+    var Console = require("../repl");
+    var Environment = require("../environment");
+
     var config = Config.detect(options);
 
     // This require a smell?
diff --git a/lib/commands/create.js b/lib/commands/create.js
index 336a30f..4e1772a 100644
--- a/lib/commands/create.js
+++ b/lib/commands/create.js
@@ -1,7 +1,3 @@
-var Config = require("truffle-config");
-var ConfigurationError = require("../errors/configurationerror");
-var create = require("../create");
-
 var command = {
   command: 'create',
   description: 'Helper to create new contracts, migrations and tests',
@@ -12,6 +8,10 @@ var command = {
     }
   },
   run: function (options, done) {
+    var Config = require("truffle-config");
+    var ConfigurationError = require("../errors/configurationerror");
+    var create = require("../create");
+
     var config = Config.detect(options);
 
     var type = config.type;
diff --git a/lib/commands/digest.js b/lib/commands/digest.js
index 6d3f569..6e5de67 100644
--- a/lib/commands/digest.js
+++ b/lib/commands/digest.js
@@ -1,11 +1,11 @@
-var Config = require("truffle-config");
-var Package = require("../package");
-
 var command = {
   command: 'digest',
   description: 'Show publishable information about the current project',
   builder: {},
   run: function (options, done) {
+    var Config = require("truffle-config");
+    var Package = require("../package");
+
     var config = Config.detect(options);
     Package.digest(config, function(err, results) {
       if (err) return done(err);
diff --git a/lib/commands/exec.js b/lib/commands/exec.js
index abd8a9b..8882913 100644
--- a/lib/commands/exec.js
+++ b/lib/commands/exec.js
@@ -1,10 +1,3 @@
-var Config = require("truffle-config");
-var ConfigurationError = require("../errors/configurationerror");
-var Require = require("truffle-require");
-var Environment = require("../environment");
-var path = require("path");
-var OS = require("os");
-
 var command = {
   command: 'exec',
   description: 'Execute a JS module within this Truffle environment',
@@ -14,6 +7,13 @@ var command = {
     }
   },
   run: function (options, done) {
+    var Config = require("truffle-config");
+    var ConfigurationError = require("../errors/configurationerror");
+    var Require = require("truffle-require");
+    var Environment = require("../environment");
+    var path = require("path");
+    var OS = require("os");
+
     var config = Config.detect(options);
 
     var file = options.file;
diff --git a/lib/commands/init.js b/lib/commands/init.js
index 479fda0..c1e052b 100644
--- a/lib/commands/init.js
+++ b/lib/commands/init.js
@@ -1,11 +1,11 @@
-var Config = require("truffle-config");
-var init = require("../init");
-
 var command = {
   command: 'init',
   description: 'Initialize new Ethereum project with example contracts and tests',
   builder: {},
   run: function (options, done) {
+    var Config = require("truffle-config");
+    var init = require("../init");
+
     var config = Config.default();
     init(config.working_directory, done);
   }
diff --git a/lib/commands/install.js b/lib/commands/install.js
index 02b333a..603ba37 100644
--- a/lib/commands/install.js
+++ b/lib/commands/install.js
@@ -1,11 +1,11 @@
-var Config = require("truffle-config");
-var Package = require("../package");
-
 var command = {
   command: 'install',
   description: 'Install a package from the Ethereum Package Registry',
   builder: {},
   run: function (options, done) {
+    var Config = require("truffle-config");
+    var Package = require("../package");
+
     if (options._ && options._.length > 0) {
       options.packages = options._;
     }
diff --git a/lib/commands/migrate.js b/lib/commands/migrate.js
index b0b93e8..1b3abef 100644
--- a/lib/commands/migrate.js
+++ b/lib/commands/migrate.js
@@ -1,11 +1,3 @@
-var OS = require("os");
-var Config = require("truffle-config");
-var Contracts = require("../contracts");
-var Resolver = require("truffle-resolver");
-var Artifactor = require("truffle-artifactor");
-var Migrate = require("truffle-migrate");
-var Environment = require("../environment");
-
 var command = {
   command: 'migrate',
   description: 'Run migrations to deploy contracts',
@@ -25,6 +17,14 @@ var command = {
     }
   },
   run: function (options, done) {
+    var OS = require("os");
+    var Config = require("truffle-config");
+    var Contracts = require("../contracts");
+    var Resolver = require("truffle-resolver");
+    var Artifactor = require("truffle-artifactor");
+    var Migrate = require("truffle-migrate");
+    var Environment = require("../environment");
+
     var config = Config.detect(options);
 
     Contracts.compile(config, function(err) {
diff --git a/lib/commands/networks.js b/lib/commands/networks.js
index d3b3c12..5855efd 100644
--- a/lib/commands/networks.js
+++ b/lib/commands/networks.js
@@ -1,6 +1,3 @@
-var Config = require("truffle-config");
-var Networks = require("../networks");
-
 var command = {
   command: 'networks',
   description: 'Show addresses for deployed contracts on each network',
@@ -12,6 +9,9 @@ var command = {
     }
   },
   run: function (options, done) {
+    var Config = require("truffle-config");
+    var Networks = require("../networks");
+
     var config = Config.detect(options);
 
     if (options.clean) {
diff --git a/lib/commands/publish.js b/lib/commands/publish.js
index 7b33c8a..034f5c7 100644
--- a/lib/commands/publish.js
+++ b/lib/commands/publish.js
@@ -1,11 +1,11 @@
-var Config = require("truffle-config");
-var Package = require("../package");
-
 var command = {
   command: 'publish',
   description: 'Publish a package to the Ethereum Package Registry',
   builder: {},
   run: function (options, done) {
+    var Config = require("truffle-config");
+    var Package = require("../package");
+
     var config = Config.detect(options);
     Package.publish(config, done);
   }
diff --git a/lib/commands/serve.js b/lib/commands/serve.js
index fcf853e..010d923 100644
--- a/lib/commands/serve.js
+++ b/lib/commands/serve.js
@@ -1,7 +1,3 @@
-var Serve = require("../serve");
-var Config = require("truffle-config");
-var watch = require("./watch");
-
 var command = {
   command: 'serve',
   description: 'Serve the build directory on localhost and watch for changes',
@@ -12,6 +8,10 @@ var command = {
     }
   },
   run: function (options, done) {
+    var Serve = require("../serve");
+    var Config = require("truffle-config");
+    var watch = require("./watch");
+
     var config = Config.detect(options);
     Serve.start(config, function() {
       watch.run(options, done);
diff --git a/lib/commands/test.js b/lib/commands/test.js
index 870aadb..0446771 100644
--- a/lib/commands/test.js
+++ b/lib/commands/test.js
@@ -1,19 +1,21 @@
-var OS = require("os");
-var dir = require("node-dir");
-var temp = require("temp");
-var Config = require("truffle-config");
-var Resolver = require("truffle-resolver");
-var Artifactor = require("truffle-artifactor");
-var Test = require("../test");
-var fs = require("fs");
-var copy = require("../copy");
-var Environment = require("../environment");
-
 var command = {
   command: 'test',
   description: 'Run Mocha and Solidity tests',
   builder: {},
   run: function (options, done) {
+    var OS = require("os");
+    var dir = require("node-dir");
+    var temp = require("temp");
+    var Config = require("truffle-config");
+    var Resolver = require("truffle-resolver");
+    var Artifactor = require("truffle-artifactor");
+    var Test = require("../test");
+    var fs = require("fs");
+    var path = require("path");
+    var mkdirp = require("mkdirp");
+    var copy = require("../copy");
+    var Environment = require("../environment");
+
     var config = Config.detect(options);
     //config.network = "test";
 
diff --git a/lib/commands/version.js b/lib/commands/version.js
index ea25621..68f01f5 100644
--- a/lib/commands/version.js
+++ b/lib/commands/version.js
@@ -1,10 +1,10 @@
-var pkg = require("../../package.json");
-
 var command = {
   command: 'version',
   description: 'Show version number and exit',
   builder: {},
   run: function (options, done) {
+    var pkg = require("../../package.json");
+
     options.logger.log("Truffle v" + pkg.version);
     done();
   }
diff --git a/lib/commands/watch.js b/lib/commands/watch.js
index b456aaf..06c438f 100644
--- a/lib/commands/watch.js
+++ b/lib/commands/watch.js
@@ -1,15 +1,15 @@
-var Build = require("../build");
-var Config = require("truffle-config");
-var chokidar = require("chokidar");
-var path = require("path");
-var colors = require("colors");
-var Contracts = require("../contracts");
-
 var command = {
   command: 'watch',
   description: 'Watch filesystem for changes and rebuild the project automatically',
   builder: {},
   run: function (options, done) {
+    var Build = require("../build");
+    var Config = require("truffle-config");
+    var chokidar = require("chokidar");
+    var path = require("path");
+    var colors = require("colors");
+    var Contracts = require("../contracts");
+
     var config = Config.detect(options);
 
     var printSuccess = function() {