Merge branch 'master' into bookshelf

Conflicts:
	README.md
Adding bookshelf and glob to common
Merge branch 'bookshelf' into bookshelf-express

Conflicts:
	README.md
	src/node-template/common.coffee