Update README.md
Merge branch 'master' into bookshelf
Merge branch 'bookshelf' of https://github.com/winton/node-template into bookshelf
Merge branch 'master' into bookshelf
Merge branch 'master' into bookshelf
Use new Common.defer
Merge branch 'bookshelf' into bookshelf-express

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