added readme
splash page text is no longer a link
removed diffmerge text
Merge branch 'master' into gh-pages