update dependencies
make tests pass
Merge pull request #2 from ramitos/master

update dependencies
Merge branch 'master' of github.com:drudge/locomotive into feature/express4

Conflicts:
	lib/controller.js
	lib/underlay/express.js
	lib/utils.js
	package.json