config overriding

Hi Tim,

  I found that using the ```_.extend``` will override the configurations, like "shim configs", in app/config.js.

  It should be ```_.merge``` instead.

Thanks.