some tidying
some tidying
Merge branch 'master' into draft

Conflicts:
	README.md
	bin/setup.js
	book/book-search.js
	mongodb/mongo-sample-data.js
added multi environment configuration