Add Underscore.js, clean package.json, merge InfSearch into Search