Merge back from v2

Optimize for newest version of express, need to use custom version of grunt-express until https://github.com/blai/grunt-express/pull/67 is merged.