Forgot to return promise in loadBookshelf()
Merge branch 'bookshelf' into bookshelf-express

Conflicts:
	src/node-template.coffee