Making test running against phpunit 4.*, and fix phpunit version for dev
Merge pull request #369 from joelwurtz/fix/travis-unittest

Making test running against phpunit 4.*