some minor fixes, more to come
Merge remote-tracking branch 'upstream/master'

Conflicts:
	htmldocs/contributing.html
Merge pull request #5 from TheMue/master

First changes for minor bugs found during review