Fix whitespace
Fix dist target and comment refering to svn
Assorted whitespace fixes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Makefile