update version of underscore/angular. other fixes