Add dev dependency on PHPUnit 3.7
Split configuration properties
Merge pull request #28 from maetl/configure-state-cleanly

Configure state cleanly
Merge remote-tracking branch 'upstream/master'