Merge new commits onto my old version

@golodhrim I tried to keep as many ebuilds as possible when resolving conflicts.