Merge branch 'master' of https://github.com/winton/node-template into express

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

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