Additions, re-ordering.
Remove docs folder before updating them.
Merge branch 'master' into gh-pages
Updating docs.