Fix previous merges

Build scripts (create and build) were mangled somewhat by the previous
merge commits. This resets them to (almost) exactly the same state as
the 3.6.x (master) branch.

Conflicts:
	bin/lib/create.js

bin/templates/cordova/lib/build.js

@@ -24,7 +24,6 @@ var shell   = require('shelljs'),
     Q       = require('q'),
     path    = require('path'),
     fs      = require('fs'),
-    which   = require('which'),
     ROOT    = path.join(__dirname, '..', '..');
 var check_reqs = require('./check_reqs');