bumping express to 3.5
Merge commit '13568c9d7bf508a2cc8ac0a64429ee9a6b24c998'
Merge commit 'b58aeee2008a4f6bae39b6334a3d195f232edde0'
Merge pull request #631 from leider/master

bumping express to 3.5