copy node_modules so www is self contained
Merge branch 'master' into Node-modules

Conflicts:
	package.json
Merge pull request #49 from Wikia/Node-modules

copy node_modules so www is self contained