More docs
Merge branch 'moredocs'

Conflicts:
	g2c/makefile