12.04 bring readme up to date
Update merge tool
README.md add info for Fedora
merge tool Tweak syntax