Underscore 1.7.0 upgrade

This is due to an underscore 1.7.0 breaking change.
See: https://github.com/jashkenas/underscore/issues/1736