Include ETag in HEAD requests

fixes #2083
Merge branch 'master' of github.com:ElectricHummingbird/express

Conflicts:
	test/app.head.js