Tidy up a few dependency issues

- The behat 2.5 branch is equal to the 2.5.3 tag

- Move phpunit to require-dev as a dev dependency to avoid conflicts
  with other projects that may use a different version of phpunit.