minor updates to rest of files to bring in coherent look and feel
Merge branch 'master' into gh-pages