Merge branch 'master' of github.com:named-data/ndn-js

Conflicts:
	js/face.js
Face: Remove debug to console.log.
tests: In node fetch.js, remove unused 'require' statements. Don't need to pass a template to expressInterest.
tests: Added node test-echo-consumer.
Merge branch 'master' of github.com:rynomad/ndn-js into npm

Conflicts:
	js/face.js
Merge https://github.com/named-data/ndn-js into npm

Conflicts:
	build/ndn.js