reorder requires in a more logical manner

lib/contracts/contracts.js

@@ -1,7 +1,8 @@
-var Compiler = require('./compiler.js');
 var toposort = require('toposort');
 var async = require('async');
 
+var Compiler = require('./compiler.js');
+
 // TODO: create a contract object
 
 var adjustGas = function(contract) {

lib/contracts/deploy.js

@@ -1,7 +1,9 @@
 var async = require('async');
+
+var RunCode = require('../core/runCode.js');
+
 var DeployTracker = require('./deploy_tracker.js');
 var ABIGenerator = require('./abi.js');
-var RunCode = require('../core/runCode.js');
 
 var Deploy = function(options) {
   this.web3 = options.web3;

lib/core/services.js

@@ -1,5 +1,6 @@
 var Web3 = require('web3');
 var async = require('async');
+
 var utils = require('./utils.js');
 
 var ServicesMonitor = function(options) {

lib/core/test.js

@@ -1,12 +1,15 @@
 var async = require('async');
 var Web3 = require('web3');
+
 var Embark = require('../index.js');
+
+var ABIGenerator = require('../contracts/abi.js');
 var ContractsManager = require('../contracts/contracts.js');
 var Deploy = require('../contracts/deploy.js');
-var TestLogger = require('./test_logger.js');
+
 var Config = require('./config.js');
-var ABIGenerator = require('../contracts/abi.js');
 var RunCode = require('./runCode.js');
+var TestLogger = require('./test_logger.js');
 
 var Test = function(_options) {
   var options = _options || {};

lib/pipeline/watch.js

@@ -1,7 +1,8 @@
 /*jshint esversion: 6 */
-var fs = require('../core/fs.js');
 var chokidar = require('chokidar');
 
+var fs = require('../core/fs.js');
+
 // TODO: this should be receiving the config object not re-reading the
 // embark.json file
 var Watch = function(options) {