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-12.04' into ubuntu-13.04
Update README.md
Merge branch 'ubuntu-13.04' into ubuntu-13.10

Conflicts:
	README.md
Merge remote-tracking branch 'origin/ubuntu-13.10' into fedora-20