expressJs 4 compatibility
Merge pull request #22 from maxdow/express4

upgrade to express 4.x
Merge branch 'master' into tests

Conflicts:
	package.json