copy node_modules so www is self contained
Merge pull request #47 from Wikia/HG-57

HG-57 replace Q with Bluebird for promises, implement Hapi caching
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
Small fixes
Definitely remove Q
HG-57 merge from master