Update to recent version of underscore and add underscore-contrib

Also, "EEW, TAB CHARACTERS!"