phpunit 3.7
Merge branch 'master' into current

Conflicts:
	puphpet/config.yaml