Updates to plan and documentation
Merge branch 'master' into gh-pages
Updating gh-pages with latest generated docs