Merge underscore+typed versions together

Removed the underscore-typed files.  Changed the underscore.d.ts file with the 'merged' version, including the tests file.