Fix some tests.
Whitespaces cleanup
Merge branch 'master' into tomgross-ptc

Conflicts:
	buildout.cfg