12.04 bring readme up to date
Update merge tool
README.md add info for Fedora
merge tool Tweak syntax
Merge remote-tracking branch 'origin/ubuntu-13.10' into fedora-20

Conflicts:
	README.md