phase 1 of resolving submodule with file collision trouble
phase 2: re-adding the underscore.js submodule