Removed node modules in place of package file
Merge branch 'master' of https://github.com/DAHeath/4420

Conflicts:
	node_modules/clusterfck/Jakefile.js
	node_modules/clusterfck/README.md
	node_modules/clusterfck/lib/clusterfck.js
	node_modules/clusterfck/lib/kmeans.js
	node_modules/clusterfck/package.json
	node_modules/clusterfck/test/runcv.js
	node_modules/clusterfck/test/sanity/kmeans/distance.js
	node_modules/clusterfck/test/visual/files/rgb.js
	node_modules/clusterfck/test/visual/runvisual.js
	node_modules/express/History.md
	node_modules/express/Readme.md
	node_modules/express/lib/response.js
	node_modules/express/lib/router/index.js
	node_modules/express/node_modules/accepts/HISTORY.md
	node_modules/express/node_modules/accepts/README.md
	node_modules/express/node_modules/accepts/node_modules/mime-types/HISTORY.md
	node_modules/express/node_modules/accepts/node_modules/mime-types/node_modules/mime-db/db.json
	node_modules/express/node_modules/accepts/node_modules/mime-types/node_modules/mime-db/package.json
	node_modules/express/node_modules/accepts/node_modules/mime-types/package.json
	node_modules/express/node_modules/accepts/node_modules/negotiator/package.json
	node_modules/express/node_modules/accepts/package.json
	node_modules/express/node_modules/cookie-signature/package.json
	node_modules/express/node_modules/debug/package.json
	node_modules/express/node_modules/depd/package.json
	node_modules/express/node_modules/escape-html/package.json
	node_modules/express/node_modules/etag/HISTORY.md
	node_modules/express/node_modules/etag/README.md
	node_modules/express/node_modules/etag/node_modules/crc/.npmignore
	node_modules/express/node_modules/etag/node_modules/crc/README.md
	node_modules/express/node_modules/etag/node_modules/crc/lib/crc1.js
	node_modules/express/node_modules/etag/node_modules/crc/lib/crc16.js
	node_modules/express/node_modules/etag/node_modules/crc/lib/crc16_ccitt.js
	node_modules/express/node_modules/etag/node_modules/crc/lib/crc16_modbus.js
	node_modules/express/node_modules/etag/node_modules/crc/lib/crc24.js
	node_modules/express/node_modules/etag/node_modules/crc/lib/crc32.js
	node_modules/express/node_modules/etag/node_modules/crc/lib/crc8.js
	node_modules/express/node_modules/etag/node_modules/crc/lib/crc8_1wire.js
	node_modules/express/node_modules/etag/node_modules/crc/lib/create.js
	node_modules/express/node_modules/etag/node_modules/crc/package.json
	node_modules/express/node_modules/etag/package.json
	node_modules/express/node_modules/finalhandler/package.json
	node_modules/express/node_modules/fresh/package.json
	node_modules/express/node_modules/media-typer/package.json
	node_modules/express/node_modules/methods/package.json
	node_modules/express/node_modules/on-finished/node_modules/ee-first/package.json
	node_modules/express/node_modules/on-finished/package.json
	node_modules/express/node_modules/parseurl/package.json
	node_modules/express/node_modules/proxy-addr/HISTORY.md
	node_modules/express/node_modules/proxy-addr/node_modules/forwarded/package.json
	node_modules/express/node_modules/proxy-addr/node_modules/ipaddr.js/ipaddr.min.js
	node_modules/express/node_modules/proxy-addr/node_modules/ipaddr.js/lib/ipaddr.js
	node_modules/express/node_modules/proxy-addr/node_modules/ipaddr.js/package.json
	node_modules/express/node_modules/proxy-addr/node_modules/ipaddr.js/src/ipaddr.coffee
	node_modules/express/node_modules/proxy-addr/node_modules/ipaddr.js/test/ipaddr.test.coffee
	node_modules/express/node_modules/proxy-addr/package.json
	node_modules/express/node_modules/qs/CHANGELOG.md
	node_modules/express/node_modules/qs/Makefile
	node_modules/express/node_modules/qs/README.md
	node_modules/express/node_modules/qs/index.js
	node_modules/express/node_modules/qs/lib/parse.js
	node_modules/express/node_modules/qs/lib/utils.js
	node_modules/express/node_modules/qs/package.json
	node_modules/express/node_modules/qs/test/parse.js
	node_modules/express/node_modules/qs/test/stringify.js
	node_modules/express/node_modules/range-parser/package.json
	node_modules/express/node_modules/send/node_modules/destroy/package.json
	node_modules/express/node_modules/send/node_modules/mime/package.json
	node_modules/express/node_modules/send/node_modules/ms/package.json
	node_modules/express/node_modules/serve-static/package.json
	node_modules/express/node_modules/type-is/HISTORY.md
	node_modules/express/node_modules/type-is/node_modules/mime-types/HISTORY.md
	node_modules/express/node_modules/type-is/node_modules/mime-types/node_modules/mime-db/db.json
	node_modules/express/node_modules/type-is/node_modules/mime-types/node_modules/mime-db/package.json
	node_modules/express/node_modules/type-is/node_modules/mime-types/package.json
	node_modules/express/node_modules/type-is/package.json
	node_modules/express/node_modules/utils-merge/package.json
	node_modules/express/node_modules/vary/package.json
	node_modules/express/package.json
	node_modules/jade/.release.json
	node_modules/jade/README.md
	node_modules/jade/Readme_zh-cn.md
	node_modules/jade/component.json
	node_modules/jade/jade.js
	node_modules/jade/lib/compiler.js
	node_modules/jade/lib/index.js
	node_modules/jade/lib/lexer.js
	node_modules/jade/lib/parser.js
	node_modules/jade/lib/runtime.js
	node_modules/jade/node_modules/character-parser/README.md
	node_modules/jade/node_modules/character-parser/index.js
	node_modules/jade/node_modules/character-parser/package.json
	node_modules/jade/node_modules/commander/Readme.md
	node_modules/jade/node_modules/commander/index.js
	node_modules/jade/node_modules/commander/package.json
	node_modules/jade/node_modules/constantinople/README.md
	node_modules/jade/node_modules/constantinople/index.js
	node_modules/jade/node_modules/constantinople/package.json
	node_modules/jade/node_modules/mkdirp/package.json
	node_modules/jade/node_modules/monocle/node_modules/readdirp/node_modules/minimatch/.npmignore
	node_modules/jade/node_modules/monocle/node_modules/readdirp/node_modules/minimatch/README.md
	node_modules/jade/node_modules/monocle/node_modules/readdirp/node_modules/minimatch/minimatch.js
	node_modules/jade/node_modules/monocle/node_modules/readdirp/node_modules/minimatch/package.json
	node_modules/jade/node_modules/monocle/node_modules/readdirp/node_modules/minimatch/test/basic.js
	node_modules/jade/node_modules/monocle/node_modules/readdirp/node_modules/minimatch/test/brace-expand.js
	node_modules/jade/node_modules/monocle/node_modules/readdirp/package.json
	node_modules/jade/node_modules/monocle/package.json
	node_modules/jade/node_modules/transformers/node_modules/css/node_modules/css-parse/package.json
	node_modules/jade/node_modules/transformers/node_modules/css/node_modules/css-stringify/package.json
	node_modules/jade/node_modules/transformers/node_modules/css/package.json
	node_modules/jade/node_modules/transformers/node_modules/promise/node_modules/is-promise/package.json
	node_modules/jade/node_modules/transformers/node_modules/promise/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/optimist/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/source-map/node_modules/amdefine/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/source-map/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/package.json
	node_modules/jade/node_modules/transformers/package.json
	node_modules/jade/node_modules/void-elements/package.json
	node_modules/jade/node_modules/with/index.js
	node_modules/jade/node_modules/with/package.json
	node_modules/jade/package.json
	node_modules/jade/release.js
	node_modules/jade/runtime.js
	node_modules/mongoose/History.md
	node_modules/mongoose/lib/document.js
	node_modules/mongoose/lib/model.js
	node_modules/mongoose/lib/query.js
	node_modules/mongoose/lib/utils.js
	node_modules/mongoose/node_modules/hooks/package.json
	node_modules/mongoose/node_modules/mongodb/node_modules/bson/package.json
	node_modules/mongoose/node_modules/mongodb/node_modules/readable-stream/node_modules/core-util-is/package.json
	node_modules/mongoose/node_modules/mongodb/node_modules/readable-stream/node_modules/inherits/package.json
	node_modules/mongoose/node_modules/mongodb/node_modules/readable-stream/node_modules/string_decoder/package.json
	node_modules/mongoose/node_modules/mongodb/node_modules/readable-stream/package.json
	node_modules/mongoose/node_modules/mpath/package.json
	node_modules/mongoose/node_modules/mpromise/package.json
	node_modules/mongoose/node_modules/muri/package.json
	node_modules/mongoose/node_modules/regexp-clone/package.json
	node_modules/mongoose/node_modules/sliced/package.json
	node_modules/mongoose/package.json