Update documentation.
Merge branch 'master' of https://github.com/mpetersen/nelson.git

Conflicts:
	README.md
Documentation fix.