Update README.md
remove deprectated stuff
Merge branch 'master' into gh-pages