updating master with docs from gh-pages