Added surfraw, removed some plugins