Merge branch 'master' into express
express test
Merge branch 'express' into bookshelf-express

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