updated readme
updated readme
misc
various
various
Merge commit '4d17201d8bad1920c3211e45829c9afdeb714900' into gh-pages