merge-real: Enable i686.
sign-real: Fix a bug.
Add makepkg.conf files for i686 and x86_64.

This will help keep builds consistent.