removed the underscore addon, as it turns out lodash has a merge function that does the same thing