Use lodash merge instead of defaults

Lodash defaults currently only does not do a deep merge of objects which causes an overwrite of default options in ember-app.js. I switched it to use _merge instead - http://lodash.com/docs#merge
I believe that `defaults` is correct here, as `trees` is not nested.