Merge branch 'master' into gh-pages
Removing CSS cruft
Update README.md