some context fixes
Merge branch 'master' of https://github.com/rilian/n2o

Conflicts:
	doc/index.tex
	doc/setup.tex