ruby1.9-yard: Fix conflict with ruby-yard.
ruby1.9-diff-lcs: Increment pkgrel.
ruby1.9-nokogiri: Fix conflict with ruby-nokogiri.
Merge branch 'master' of https://github.com/BlackArch/blackarch