cisco-ocs: Rename bin to 'cisco-ocs' to avoid conflict with 'cscope'.
xorsearch: Move to the new 'blackarch-crypto' group.
rcracki-mt: Mark as conflicting with rcrack_mt.
merge-real: Enable i686.
sign-real: Fix a bug.
Add makepkg.conf files for i686 and x86_64.

This will help keep builds consistent.
make-repo: Add i686 support.
bachroot: Add i686/gcc-multilib support.
Merge branch 'unstable' of https://github.com/BlackArch/blackarch