updated manifest, changed the jquery that grabs the title links
fixed merge conflicts