Use merge instead of extend so we can provide a callback to recursively merge
Added latest version of lodash, use lodash instead of grunt.util
Moved lodash to deps rather than dev-deps