removed some unneeded packages, added yaourt requirement to the ones that need it
fixed merge conflicts