Safeguards against loading too many instances of bookshelf
Clean up logic
Removing dup test
Merge branch 'bookshelf' into bookshelf-express

Conflicts:
	src/node-template.coffee
	test/node-template.coffee