up americano version
update configuration to make it compliant with express 4
update dependencies
fix redirection
build
Merge branch 'master' of github.com:frankrousseau/cozy-proxy

Conflicts:
	package.json
fix npm manifest
fix socket proxying with express4
fix cookie jar for tests
extensive websocket proxying tests
Merge pull request #71 from aenario/express4

Express4