updating master to match gh-pages