express integration
Merge remote-tracking branch 'origin/master'

Conflicts:
	dustin.js
	package.json
express integration