Express 4 + updated dependencies
Merged Gruntfile conflict