Merge pull request #631 from leider/master

bumping express to 3.5
updating grunt-mocha-istanbul so that from now on only files inside /lib/ are checked for coverage rules