Update documentation
fixing stuff..again.
Merge branch 'gh-pages'