Some moreon the haml-comment thing
Merge branch 'master' of https://github.com/halhenke/doctor

Also a bunch of further changes i made - haml-comment related....

Conflicts:
	emacs knowledge.org