improved mixed-indent and remove trailing character
Merge branch 'master' of https://github.com/kdurant/vimcdoc into kdurant-master

Conflicts:
	doc/gui_x11.cnx
	doc/options.cnx
Merge branch 'kdurant-master'