Make pourover work with lodash (non-underscore build).
pre-lodash-merge
fixed conflicts
Merge branch 'jdalton-lodash'