Migrate to Express version 4 and specify versions in package.json for runtime deps.
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json