some context fixes
Merge pull request #1 from 5HT/master

merge upstream
Merge branch 'master' of https://github.com/rilian/n2o

Conflicts:
	doc/index.tex
	doc/setup.tex
Merge pull request #119 from rilian/master

fix some wording